Continued work on sr/vcs-helper and sr/gfi-options

Heya,

I'm planning to start finishing up git-remote-hg this week, and for
that I need both sr/vcs-helper (in next) and sr/gfi-options (in pu).
How can I best go about working on these? I _think_ what I want is to
merge sr/vcs-helper and sr/gfi-options, into either master or next
(with a three-way merge), but I'm not sure? Also, when I try to rebase
sr/vcs-helper onto master I get conflicts yet again, since these were
already resolved in next, what is the best way for me to proceed in
such a way that it is convenient for you (Junio) and the list, if
possible, without having to untangle those merge conflicts.

Thanks!

-- 
Cheers,

Sverre Rabbelier

On Sun, Dec 06, 2009 at 01:53:03AM +0100, Sverre Rabbelier [off-list ref] wrote:

(with a three-way merge), but I'm not sure? Also, when I try to rebase
sr/vcs-helper onto master I get conflicts yet again, since these were

That part is fairly easy, just don't forget to enable rerere. :)