I like p4merge. It's the UI from perforce, but it's free and you can use it with... | Hacker News

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

login

keypusher on Jan 3, 2018 | parent | context | favorite | on: Fix All Conflicts: Easy-To-use CUI for Fixing Git ...

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

Example:

https://www.perforce.com/sites/default/files/image/2017-06/s...

stavros on Jan 3, 2018 [–]

Meld is another popular Linux one, but I've somehow always been more confused than helped by the 3-way diff.

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