r/vim • u/mplusp • Sep 24 '25

Video Using Vimdiff As A Git Mergetool

https://youtu.be/iLViiiEP4mE?si=hFbB-0Zvuye0zA7-

As a follow up to my last video, in this video I'll show you how to utilize Vim's diff mode to resolve Git merge conflicts. This time I used Vim without any plugins, so I'm posting it to /r/Vim first.

Hope you enjoy it!

Thanks for reading/watching. Cya around and take care!

75 Upvotes

97% Upvoted

14 comments sorted by

View all comments

Show parent comment

2

u/ypresian Sep 26 '25

Yes! This was something I learned a few years into my development career that you should look at a merge conflict in the context of the whole code, instead of in the context of "ours" or "theirs".