News for hackers. Stuff that matters.

A comment on Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts. Parent comment

Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by piscisaureus on Tuesday January 02, 2018 @10:09PM (#16057976)
I find "beyond compare" to be a very good merge tool. It's not free, but not very expensive either, and works well with git.

(I'm not affiliated with them in any way)

[ Parent | on HN ]
Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by partycoder on Wednesday January 03, 2018 @03:01AM (#16059337)
Beyond Compare is a good tool. It allows to compare full directories, ignore whitespace, etc.

I recommend Perforce's as a merge tool because it is better than average at the specific task of merging.

[ Parent | on HN ]