Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Aha Moments When Learning Git. Parent comment
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.
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.