Git: how to resolve merge conflicts #1 Post by robertp1984 » Mon, Mar 03, 2014, 8:11 PM UTC Git: how to resolve merge conflictssoftwarecave.org