Search

Home > Vimcasts > Fugitive.vim - resolving merge conflicts with vimdiff
Podcast: Vimcasts
Episode:

Fugitive.vim - resolving merge conflicts with vimdiff
Category: Technology
Duration: 00:11:35
Publish Date: 2011-05-05 19:00:00
Description:

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.
Total Play: 0