If I ever used something for my merge/diff tool for git I would use either meld or diff-so-fancy but doing it in vim seems awesome as well:
Vim can be used as a mergetool to handle git merge conflict.
First, setup Vim as a mergetool in your gitconfig. Then, during a merge conflict, run:
You can then use Vim to pick which change(s) to apply to the working copy.
To setup Vim as a mergetool in my gitconfig, I added these in my
~/.gitconfig (your gitconfig may be in a different location):
[core] editor = vim [merge] tool = vimdiff conflictstyle = diff3 [difftool] prompt = false
To get changes from local/base/remote:
- :diffget LOCAL
- :diffget BASE
- :diffget REMOTE
To go to next/prev changes: