Vim universe. Vim as a merge tool

Alexey Samoshkin demonstrates how to resolve Git conflicts using Vim and the vim-mergetool plugin.

Configuring Vim into a powerful merge tool to resolve conflicts with pleasure. Exploring "samoshkin/vim-mergetool" plugin features. Topics discussed: - why conflicts happen, the anatomy of conflict markers - how to resolve conflicts manually without any merge tools - aborting merge as a whole or only an individual file - using standard "vimdiff" as a merge tool, and talking about its shortcomings - Use "github.com/samoshkin/vim-mergetool" Vim plugin as a replacement to "vimdiff" to make conflict resolution more productive and pleasant. Explore its features. Links and resources: samoshkin/vim-mergetool: Efficient way of using Vim as a Git mergetool - github.com/samoshkin/vim-mergetool Test Vimrc configuration created during a demo: gist.github.com/samoshkin/7f815a6acc7ca1be2e5fc3493573d303 My production Vimrc - github.com/samoshkin/dotvim