> original file, version A, version B, merged result Isn't one of version A or B... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

anamexis on March 20, 2022 | parent | context | favorite | on: Meld is a visual diff and merge tool targeted at d...

> original file, version A, version B, merged result

Isn't one of version A or B the original file? What am I missing?

jrib on March 20, 2022 | [–]

http://psung.blogspot.com/2011/02/reducing-merge-headaches-g...

This is a good discussion on the topic including the diff3 option git has.

rubyist5eva on March 20, 2022 | | [–]

the "original" file is the common ancestor of version A and version B

rdiddly on March 20, 2022 | [–]

In a merge conflict versions A & B would tend to be different changes made to the original, usually made by different people.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact