News for hackers. Stuff that matters.
Re:Aha Moments When Learning Git by fr0sty on Monday June 13, 2011 @11:28AM (#2649347)
I just tried this btw,

If you merge B and C you will only have a conflict if the changes in B and C touch the same regions of the file.

If not the merge is made automatically and the changes from both branches are reflected in the new file.

There are no comments on this comment yet.