DEV Community

Cover image for I made a 3-way terminal Git conflict resolver inspired by IntelliJ
Neo
Neo

Posted on

I made a 3-way terminal Git conflict resolver inspired by IntelliJ

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

Top comments (0)