Resolve Git Merge Conflicts with Neovim and Fugitive!

Transcript

Welcome! Today I'm going to use Vim Fugitive to resolve merge conflicts. If you aren't familiar with Fugitive, please see my previous video from last week covering that exactly, which is linked here on the top. I'm starting from one of my projects where I'm currently running on the master branch. I'll create a feature branch to create an intentiona... Read More