Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ

Show HN (score: 6)
Found: February 04, 2026
ID: 3229

Description

CLI Tool
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

More from Show

Show HN: Open-weight OCR got so cheap I had to share it

Show HN: Open-weight OCR got so cheap I had to share it This was not supposed to become a product.<p>When PaddleOCR-VL-1.6 dropped, independent benchmarks put it at the top of document parsing models. I had to try it. I needed a provider, but there simply isn&#x27;t one ready for production that I would trust.<p>So i set one up myself. I assumed that even after getting it running, serving a vision-language model would be expensive.<p>It turns out the opposite is true. Once I had it running properly, the cost was absurdly low. At proper GPU utilization, the cost is only around $1 per 1,000 pages.<p>The nearest competitors are either much lower quality (Azure Read) or absurdly expensive (Extend or Reducto). Even Mistral OCR 4 which is really good and pretty cheap is still 4x more expensive.<p>So I had to share it. I made the endpoitns public, and vibe-coded a simple dashboard.<p>Let me know what you think!

No other tools from this source yet.