News for hackers. Stuff that matters.

A comment on Git 2.9 released. Parent comment

Re:Git 2.9 released by forrestthewoods on Thursday June 16, 2016 @10:09AM (#11916189)
I still prefer Araxis.

http://www.araxis.com/merge/index.en

[ Parent | on HN ]
Re:Git 2.9 released by merb on Thursday June 16, 2016 @06:04PM (#11919232)
I use: http://www.kaleidoscopeapp.com/
[ Parent | on HN ]
Re:Git 2.9 released by zwieback on Thursday June 16, 2016 @10:30AM (#11916336)
It's the absolute best, been using it for years.
[ Parent | on HN ]
Re:Git 2.9 released by tomtheengineer on Thursday June 16, 2016 @01:14PM (#11917459)
Beyond Compare is the best I've found (especially for complex merges): http://www.scootersoftware.com/
[ Parent | on HN ]
Re:Git 2.9 released by philliphaydon on Thursday June 16, 2016 @01:40PM (#11917649)
Me too. I tried ataxia for about 6 months and hated it, got told about beyond compare, paid for a license after only a few days of the trial .
[ Parent | on HN ]
Re:Git 2.9 released by forrestthewoods on Thursday June 16, 2016 @04:23PM (#11918619)
Beyond Compare is great. I prefer Araxis. I think most people would be very happy with one of the two. Whichever you happen to prefer.
[ Parent | on HN ]