When git branches are merged, there is always the chance of a conflict arising if a file was modified in both the target and merge branches. You can resolve merge conflicts using a combination of fugitive’s :Gdiff
command, and Vim’s built in diffget
and diffput
. In this episode, we’ll find out how.
This is the third in a five part series on fugitive.vim.