Lazygit works well for merge conflicts (and many other things): https://github.c...

		arcanemachiner on Oct 14, 2024 \| parent \| context \| favorite \| on: Show HN: I made a git rebase TUI editor Lazygit works well for merge conflicts (and many other things): https://github.com/jesseduffield/lazygit (I am not actually sure what a three-way merge conflict is though TBH.)