ec is tui git conflict resolver to keep the conflict in one clear view, make the result pane the center of attention, and remove as much friction as possible. The goal is not to expose every possible merge operation. The goal is to make the common case feel calm, fast, and easy to understand.
I also wanted it to stay light. It starts in the terminal, fits well with git mergetool, works nicely from editor driven workflows, and does not try to take over your whole Git experience. It is a focused tool for one job.
ec is tui git conflict resolver to keep the conflict in one clear view, make the result pane the center of attention, and remove as much friction as possible. The goal is not to expose every possible merge operation. The goal is to make the common case feel calm, fast, and easy to understand.
I also wanted it to stay light. It starts in the terminal, fits well with git mergetool, works nicely from editor driven workflows, and does not try to take over your whole Git experience. It is a focused tool for one job.