Search notes:
git mergetool
Run
merge conflict
resolution tools to resolve merge conflicts.
See also
git commands
Index