Re: Git conflicts

[Rune Zedeler]

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

Ok, in that case I see no point in reverting and trying again.
The result should be the same.
Hmm, perhaps the best thing is to branch off a new branch (dev/rune2) 
just before the merge, and then cherry-pick the commits I did after the 
revert...?

-Rune