MergePro

IntelliJ-style three-pane merge conflict resolver for VS Code, Cursor, and other VS Code forks.

Interface

Open the Source Control panel in the activity bar to see all conflicted files grouped by MergePro. Click Resolve on any file to launch the three-pane merge editor.

Features

• SCM Panel — grouped view of all conflicted files with per-file progress bars and conflict counts.
• Three-Pane Editor — Current | Result | Incoming layout with synchronized horizontal and vertical scrolling.
• SVG Connectors — IntelliJ-style polygon shapes connecting corresponding chunks across panes.
• Color Language — green (non-conflicting), brown (true conflict), teal (resolved).
• Batch Actions — Accept All Ours, Accept All Theirs, Auto-Resolve Non-Conflicting.
• Magic Resolve — one-click resolution for conflicts where one side is a strict superset of the other.
• Navigation — Alt+Up and Alt+Down to jump between conflicts.
• Undo/Redo — full per-file decision history.

Install

VS Code Marketplace

code --install-extension ismailcherri.merge-pro

Or search "MergePro" in the Extensions view.

Open VSX (Cursor, VSCodium, Windsurf, code-server)

cursor --install-extension ismailcherri.merge-pro

Or visit the Open VSX listing.

Sideload .vsix

Download the latest .vsix from GitHub Releases and run:

code --install-extension merge-pro-0.1.0.vsix

Usage

1. Perform a git merge that creates conflicts.
2. Open the Source Control panel — MergePro lists all conflicted files with a progress indicator.
3. Click Resolve on a file to open the three-pane editor.
4. For each conflict, click the chunk action buttons (accept current, accept incoming, accept both) or edit the result pane directly.
5. Use Auto-Resolve Non-Conflicting to bulk-resolve chunks that have no true conflict.
6. Click Save to write the resolved file. MergePro stages the file with git add automatically.

Keybindings

Configuration

Customizing merge state colors

MergePro contributes six color tokens you can override per-theme via workbench.colorCustomizations in settings.json:

"workbench.colorCustomizations": {
    "mergePro.conflict.oursBackground": "#bc3f3c66",
    "mergePro.conflict.theirsBackground": "#3c64bc66",
    "mergePro.nonConflicting.oursBackground": "#62b26230",
    "mergePro.nonConflicting.theirsBackground": "#c586c030",
    "mergePro.result.unresolvedBackground": "#a0642e40",
    "mergePro.resolved.background": "#4ec9b026"
}

Use #RRGGBBAA to control transparency. Omit any token to keep its default.

Keybinding customization will follow in a later release.

Requirements

• VS Code 1.85+ (or a fork on the equivalent VS Code API version).
• Git (the built-in Git extension is sufficient).

Development

git clone https://github.com/ismailcherri/merge-pro.git
cd merge-pro
npm install

Press F5 in VS Code to launch the Extension Development Host.

Useful commands:

Contributing

Bug reports, feature requests, and pull requests are welcome. See CONTRIBUTING.md for details and CODE_OF_CONDUCT.md for community expectations.

If you are an AI coding assistant (Claude Code, Cursor, GitHub Copilot, Codex, Aider, etc.), see AGENTS.md for project-specific guidance.

License

MIT © Ismail Cherri