Re: Git conflicts

[Rune Zedeler]

Johannes Schindelin skrev:
> FWIW the proper way to undo a merge is to
>
>         $ git rebase --onto MERGE_HEAD^ MERGE_HEAD
>
> where MERGE_HEAD has to be substituted by the merge commit that you want 
> to undo.  (This command transplants the commits you did since the merge 
> onto the commit which was current right before the merge.)

Well, yeah, this is basically what I ended up doing, isn't it...?

> Note: this rewrites history, so if you pushed it already, people pulling 
> from you (as opposed to fetching) will not be happy with you pushing a 
> rewritten history.

Problem is that savannah does not accept push -f ...

-Rune