How do I jump between merge conflict markers in a file?
]n
During a git merge, Vim can navigate directly between conflict markers (>>>>>>) using ]n and [n.
Tag: merge
How do I resolve a 3-way merge conflict in vim-fugitive by picking a specific version?
:diffget //2
When resolving Git merge conflicts with vim-fugitive, running :Gvdiffsplit! opens a 3-way split: your current branch (left), the working file with conflict mark