Resolving Conflicts in Git

Photo by Jean Wimmerlin on Unsplash

If you find this post helpful, head over to my blog and check out some of my other posts!

There are quite a few ways to resolve conflicts in git, whether it’s through the command-line or a GUI. In this post, I’m going to offer an opinionated solution using the command-line and, more specifically, using a tool called vimdiff (because I’m most familiar with the Vim interface).