Git: how to resolve merge conflictshttp://softwarecave.org/2014/03/03/git-how-to-resolve-merge-conflicts/ by robertp1984 • 12 years ago 1 0 12 years agoSOsoftwarecave.org