3 ms·
I wish there were a good TUI for handling merge conflicts. Vimdiff seems to be the closest, but doesn't have keyboard bindings for 3-way merges. Nothing beats
by lostdog 2y ago
I wish there were a good TUI for handling merge conflicts. Vimdiff seems to be the closest, but doesn't have keyboard bindings for 3-way merges.
Nothing beats Meld for me, but if you're on a remote GUI-less machine, there aren't good options.
- shawn_w 2y agoemacs' smerge has always worked well for me.
- arcanemachiner 2y agoLazygit 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.)