Resolving merge conflicts on the command line
In this short video, I walk you through how I resolve merge conflicts on the command line.
First up, I take you through the process for handling simpler conflicts using Neovim, then show the same process again for more complex scenarios using lazygit.
North Meets South Web Podcast - The Vim Throwdown - • North Meets South - The Vim Throwdown
http://neovim.io/
https://github.com/tpope/vim-unimpaired
https://github.com/jesseduffield/lazygit