Submitted by johnbickar on Thu, 09/25/2014 - 08:15 Tags: gitmergeLink: Git - Quickest Way to Resolve Most Merge Conflicts