Re: Git conflicts

[Valentin Villenave]

2008/6/20 Rune Zedeler <address@hidden>:

> How did you revert?

There's only one way to revert a merge if IIRC...

> Did you specify a mainline ("git revert --mainline 1" or "git revert
> --mainline 2") ?
> I do not understand what the mainline argument is doing, but it appears that
> it should be there when reverting a merge.

Yes, AFAICR I did it all by the book. Mainline is the branch you want
to come back to, I think.

> Hmm, reverting your revert, and then reverting your merge... Huh, I doubt
> that will work, especially given that I have made other commits afterwards.
> Well, I will try when I get home ... :)

Good luck!

Cheers,
Valentin