3 ms·
> original file, version A, version B, merged result Isn't one of version A or B the original file? What am I missing?
by anamexis 5y ago
> original file, version A, version B, merged result
Isn't one of version A or B the original file? What am I missing?
- rdiddly 5y agoIn a merge conflict versions A & B would tend to be different changes made to the original, usually made by different people.
- rubyist5eva 5y agothe "original" file is the common ancestor of version A and version B
- jrib 5y agohttp://psung.blogspot.com/2011/02/reducing-merge-headaches-git-meets.html?m=1 http://psung.blogspot.com/2011/02/reducing-merge-headaches-g... This is a good discussion on the topic including the diff3 option git has.