Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ (opens in new tab)

(github.com)

18 pointsneozz3mo ago4 comments

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

4 comments

insane_dreamer3mo ago

great 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).

neozzOP3mo ago

I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.

az09mugen3mo ago

Will look into that.

neozzOP3mo ago

Thanks!!

j / k navigate · click thread line to collapse

4 comments

insane_dreamer3mo ago

neozzOP3mo ago

I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.

az09mugen3mo ago

Will look into that.

neozzOP3mo ago

Thanks!!

j / k navigate · click thread line to collapse