I find "beyond compare" to be a very good merge tool. It's not free, but not ver... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		piscisaureus on Jan 3, 2018 \| parent \| context \| favorite \| on: Fix All Conflicts: Easy-To-use CUI for Fixing Git ... 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)

partycoder on Jan 3, 2018 [–]

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.

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