3 ms·

Aren't you just describing doing a proper 3-way merge?

• vemv 9y ago
  Could be, thanks for the pointer. But the 3-way merge apps I remember conflate the past context with the would-be result, which was confusing. Googling now I see that one of them has distinct "Reference view" and "Edit view" tabs - sounds like what I was looking for. Any recommended 3-way app?
  • keypusher 9y ago
    I like p4merge. It's the UI from perforce, but it's free and you can use it with Git easily. Most 3-way merge tools will show you: yours, theirs, base, and the final result. https://www.perforce.com/downloads/visual-merge-tool https://www.perforce.com/downloads/visual-merge-tool Example: https://www.perforce.com/sites/default/files/image/2017-06/screenshot-p4v-horiz-tab-2.jpg https://www.perforce.com/sites/default/files/image/2017-06/s...
    • StavrosK 9y ago
      Meld is another popular Linux one, but I've somehow always been more confused than helped by the 3-way diff.
  • davidjnelson 9y ago
    The one built into jetbrains ides is great too.