Git am conflict

Jul 08, 2013 · Below is a sample procedure using vimdiff to resolve merge conflicts, based on this link. Step 1: Run following commands in your terminal git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false This will set vimdiff as the default merge tool..