News for hackers. Stuff that matters.

A comment on GitUp makes Git painless. Parent comment

Re:GitUp makes Git painless by LocalPCGuy on Wednesday June 03, 2015 @10:00PM (#9657015)
Take a look at P4Merge for doing your merges/diffs - it's a very nice tool for merging. You don't need the entire P4 ecosystem, the merge tool is standalone.
[ Parent | on HN ]
Re:GitUp makes Git painless by stinos on Thursday June 04, 2015 @03:10AM (#9657793)
hear hear! I've been using P4Merge for years since it's indeed very nice, also have it set as 'external difftool' in ST. Only disadavantge for me: line ending settings for the merged file are fixed, which is messy if you have repositories from different sources and/or different autocrlf settings
[ Parent | on HN ]