Lazygit works well for merge conflicts (and many other things): https://github.com/jesseduffield/lazygit https://github.com/jesseduffield/lazygit (I am not ac

Lazygit works well for merge conflicts (and many other things): https://github.com/jesseduffield/lazygit https://github.com/jesseduffield/lazygit (I am not actually sure what a three-way merge conflict is though TBH.)