News for hackers. Stuff that matters.

A comment on The largest Git repo. Parent comment

Re:The largest Git repo by eridius on Wednesday May 24, 2017 @03:22PM (#14412719)
For 3-way merging the best tool I've found is Steve Losh's splice.vim (https://github.com/sjl/splice.vim/).
[ Parent | on HN ]
Re:The largest Git repo by babuskov on Wednesday May 24, 2017 @05:38PM (#14413670)
My favorite tool is Meld:

http://meldmerge.org/

It's open source. Also:

https://stackoverflow.com/questions/572237/whats-the-best-th...

[ Parent | on HN ]
Re:The largest Git repo by 72deluxe on Thursday May 25, 2017 @05:06AM (#14416146)
Yes back when using Linux, I used Meld a lot. I can recommend it - the directory comparison is good.

Also KDiff3. Struggling to remember the other ones I used to try unfortunately.

[ Parent | on HN ]