How to resolve merge conflicts in vim


Vim is my text editor of choice in most cases. I occasionally reach for sublime but have found that lighter weight is better in most cases. I found this awesome screencast on how to resolve git merge conflicts in vim and am sharing it here in the hopes that somebody will find it valuable :smile:

1 Like

Looks pretty good :wink:

IntelliJ IDEA has good merge resolver too :wink:

It does, however vim is much more powerful. This is more of a “they this is cool” kind of thing. IntelliJ IDEA is sometimes a bit of a resource hog…I love IntelliJ – don’t get me wrong but it’s definitely a resource hog.

So will try vim. Do you have some experience with Java 8?

Get a better machine :wink: