News for hackers. Stuff that matters.
Re:Aha Moments When Learning Git by fr0sty on Monday June 13, 2011 @11:29AM (#2649356)
> Have fun merging...

I just did. As long as the changes in branches B and C are to different regions of the file the merge is completed automatically. If not, conflict markers are places in foobar.foo.in for you to resolve there.

Not sure what more you could ask of your Version Control System...

Re:Aha Moments When Learning Git by yxhuvud on Monday June 13, 2011 @03:44PM (#2650426)
I might have misrepresented the case a bit. It involved a rebase, and rebase + parallel renaming makes for strange things to happen.