category applies to 3 screencasts:
Vim’s diff mode allows us to easily compare the contents of two (or more) buffers. We can start Vim in diff mode using the
vimdiff command, or if Vim is already running we can switch to diff mode using the
:diffthis command. The beauty of the
:diffthis command is that it works with unnamed buffers, whereas
vimdiff can only work with files.
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
diffput. In this episode, we’ll find out how.
This is the third in a five part series on fugitive.vim.Watch screencast
The fugitive plugin provides an interactive status window, where you can easily stage and review your changes for the next commit. The
:Gdiff command visualizes the changes made to a file, by comparing the working copy with the index. In this episode, we’ll learn how to stage hunks of changes to the index without using the
git add --patch command.
This is the second of a five part series on fugitive.vim. In the next episode, we’ll learn how to resolve a git merge conflict by performing a 3-way vimdiff.Watch screencast