The latest articles on DEV Community by Neo (@chojs23). https://dev.to/chojs23 https://media2.dev.to/dynamic/image/width=90,height=90,fit=cover,gravity=auto,format=auto/https:%2F%2Fdev-to-uploads.s3.amazonaws.com%2Fuploads%2Fuser%2Fprofile_image%2F3751834%2Ff7af1d32-bcd8-4d1c-a3bc-29b4c406d409.jpeg https://dev.to/chojs23 en Neo Wed, 04 Feb 2026 04:26:09 +0000 https://dev.to/chojs23/i-made-a-3-way-terminal-git-conflict-resolver-inspired-by-intellij-3a5k https://dev.to/chojs23/i-made-a-3-way-terminal-git-conflict-resolver-inspired-by-intellij-3a5k <p><a href="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.amazonaws.com%2Fuploads%2Farticles%2Fiagdclox8rpc1qu18ziy.gif" class="article-body-image-wrapper"><img src="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.amazonaws.com%2Fuploads%2Farticles%2Fiagdclox8rpc1qu18ziy.gif" alt=" " width="800" height="449"></a></p> <p>I built ec because my friends who are new to development kept getting stuck on Git conflicts.</p> <p>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.</p> <p>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!</p> <p>Repo: <a href="https://github.com/chojs23/ec" rel="noopener noreferrer">https://github.com/chojs23/ec</a></p> showdev go cli neovim