When I met a conflict, I tried to use git-mergetool
to solve it. I typed:
>git mergetool -t vimdiff
It opened vimdiff
Modifying a bit the commands from this page:
git config --global mergetool.vimdiff3.cmd 'vim -f -d "$LOCAL" "$MERGED" "$REMOTE"'
git config --global merge.tool vimdiff3
And then you execute the command: git mergetool
.
Note: I use fugitive also and highly recommend it.