Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ
neozz Wednesday, February 04, 2026
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!
14
1
github.com