chojs23

chojs23 / ec

Public

Easy terminal-native 3-way git mergetool vim-like workflow

github.comchojs23ec cli conflict conflict-resolution diff3 git
145
3
100% credibility
Found Feb 04, 2026 at 39 stars 4x -- GitGems finds repos before they trend. Get early access to the next one.
Sign Up Free
AI Analysis
Go
AI Summary

A terminal tool with a three-panel view to visually resolve file clashes when merging team changes.

How It Works

1
😩 Hit a clash merging team changes

Your updates overlap with a teammate's, leaving messy markers in the file that are hard to untangle.

2
🔍 Discover easy-conflict helper

Find a friendly terminal tool that makes fixing clashes simple and visual, right where you work.

3
📥 Grab the tool quickly

Install it with one easy command, like from a trusted tap or a safe download script.

4
🚀 Launch in your project folder

Run it during the clash; it spots the problem files and lets you pick one to fix.

5
👀 See magic three-panel view

Watch your version, their version, and the blended result side-by-side – everything clear at a glance!

6
⌨️ Pick and blend changes

Use simple keys to jump between clashes, choose yours/theirs/both/none, and see updates live.

7
💾 Save the smooth result

Hit save to write the fixed file, or tweak in your editor and reload.

✅ Clashes gone, teamwork flows

Merge complete effortlessly, back to creating without frustration.

Sign up to see the full architecture

6 more

Sign Up Free

Star Growth

See how this repo grew from 39 to 145 stars Sign Up Free
Repurpose This Repo

Repurpose is a Pro feature

Generate ready-to-use prompts for X threads, LinkedIn posts, blog posts, YouTube scripts, and more -- with full repo context baked in.

Unlock Repurpose
AI-Generated Review

What is ec?

ec is a Go terminal app for resolving Git merge conflicts via a vim-like 3-pane TUI: ours, result, and theirs, with diff3 base views. Drop into a conflicted repo with `ec` to list/pick files, or set as `git mergetool` for seamless use. Neovim plugin opens it in a float/tab; non-interactive flags handle CI/scripts.

Why is it gaining traction?

Terminal-native—no app switching like VSCode or Meld. Vim keys (n/p conflicts, h/l sides, o/t apply, u undo) speed hunks; preview result live, edit in $EDITOR, write anytime. Backups, themes, and repo-relative paths make it sticky for CLI flows.

Who should use this?

Git CLI diehards merging branches daily. Neovim users on easy github projects to contribute or issues. Terminal teams avoiding GUI overhead in SSH/VSCode remote.

Verdict

Practical mergetool alternative at 93 stars; 1.0% credibility score reflects niche/early maturity, but strong docs, 70% test targets, and MIT license invite trials. Use for simple conflicts; pair with editors for beasts.

(178 words)

Sign up to read the full AI review Sign Up Free

Similar repos coming soon.