# Ec

> Ec is a terminal-based Git conflict resolver that displays conflicts in three panes with a step-by-step workflow, modeled after JetBrains' IntelliJ interface.

Page: https://nowfound.app/launch/ec-a-terminal-git-conflict-resolver-inspired-by-intellij

- Launched: 2026-02-04
- Launch-day votes: 18, 4 comments; #784 of 16,623 launches that month (top 5%)
- Website: [github.com](https://github.com/chojs23/ec), online when checked 2026-09-11
- Category: [Dev tools](https://nowfound.app/c/developer-tools.md)
- Pricing: Free. Free and open source (checked 2026-11-21 on its site)

## In plain words

Ec is a terminal-based Git conflict resolver that displays conflicts in three panes with a step-by-step workflow, modeled after JetBrains' IntelliJ interface. Designed for developers new to resolving merge conflicts, it aims to be more intuitive than other terminal merge tools. The tool runs natively in the terminal and guides users through conflict resolution in a focused, straightforward manner.

## What it does, from its own words

Terminal-native 3-way git mergetool and diff viewer - chojs23/ec

## Does a similar job

- [Sublime Merge](https://nowfound.app/launch/sublime-merge-a-git-client-from-the-makers-of-sublime-text): Discover a powerful Git GUI Client for Mac, Windows and Linux, from the makers of Sublime Text. Line-by-line Staging. Commit Editing. Unmatched Performance. (2018-09-20, 935 votes, sublimemerge.com)
- [Gut](https://nowfound.app/launch/gut-an-easy-to-use-cli-for-git): Gut is a command-line interface for Git designed to be more user-friendly than standard Git. (2023-03-30, 314 votes, gut-cli.dev)
- [ocli](https://nowfound.app/launch/i-made-a-git-rebase-tui-editor): This is a terminal-based editor for Git interactive rebasing that brings IntelliJ's rebase interface to the command line. (2024-10-13, 115 votes, free, github.com)
- [I rebuilt the only parts of my IDE I use, in](https://nowfound.app/launch/i-rebuilt-the-only-parts-of-my-ide-i-use-in-rust-over-a-week): Kyde is a native macOS application for viewing Git commits and diffs, built as a lightweight alternative to full IDEs for developers who spend most of their time on Git operations. (2026-06-22, 50 votes, free, github.com)
- [Fork](https://nowfound.app/launch/fork): Fast and friendly git client for Mac and Windows (2018-05-29, 168 votes, git-fork.com)
- [Devsession](https://nowfound.app/launch/devsession): Concurrent coding from your own IDE or terminal of choice (2022-01-13, 88 votes, devsession.is)

All alternatives: https://nowfound.app/alternatives/ec-a-terminal-git-conflict-resolver-inspired-by-intellij.md

## For the maker of Ec

- Feature it at the top of the NowFound home page for $19 for 30 days, marked sponsored: https://nowfound.app/feature/ec-a-terminal-git-conflict-resolver-inspired-by-intellij
- Free: put the badge on the product's own site and it joins Featured products after the paid spots. HTML for the footer: `<a href="https://nowfound.app/launch/ec-a-terminal-git-conflict-resolver-inspired-by-intellij"><img src="https://nowfound.app/badge/ec-a-terminal-git-conflict-resolver-inspired-by-intellij.svg" alt="Ec on NowFound" height="32"></a>`

Source: [Show HN post](https://news.ycombinator.com/item?id=46879559)
