7 ms·
Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ
Hi HN, I built ec because my friends who are new to development kept getting stuck on Git conflicts.
Most TUI merge tools felt hard to use or non-intuitive for them. The only flow they found easy was the IntelliJ (JetBrains) conflict resolver, so I recreated that experience in the terminal.
ec is a terminal-native, 3-pane conflict resolver with a focused, step-by-step flow.
If you try it and leave feedback, I would be really grateful. Thanks!
Repo: https://github.com/chojs23/ec https://github.com/chojs23/ec
- az09mugen 8mo agoWill look into that.
- deleted 8mo ago[deleted]
- neozz 8mo agoThanks!!
- insane_dreamer 7mo agogreat stuff! would love to see this integrated into Lazygit, which I've found the best TUI git tool overall but doesn't have as good of a conflict resolution UX as you've done here (or JetBrains, which is the gold standard in GUI tools, IMO).
- neozz 7mo agoI use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.