Automatic merge conflict resolution with Gitprogit.org2 points·schacon··0 commentsOpen articleSaveView on HN