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.

[tabotkevin]

Hey Michael, both your zsh and nvim setup are so stunning, please can you share your config?

[nmo]

I didn't know something like lazygit existed until now, this has greatly improved my workflow! And, your Neovim looks absolutely stunning! How did you manage to get that amount of line height/padding? It almost looks like a GUI.

[oleksandr-petrovych]

Цікаве в тебе прізвище. Твої предки мали українське коріння?