Merge Easy

A side-by-side merge conflict editor for VS Code – three panels side by side (LOCAL · RESULT · REMOTE) with live word-level diff highlighting and bezier ribbon connectors between matching blocks.

Features

• 3-panel layout – LOCAL (your changes) | RESULT (live editable center) | REMOTE (incoming)
• Word-level diff – changed tokens are highlighted with a brighter background in all three panels so you instantly see what exactly changed
• SVG ribbon connectors – bezier ribbons visually connect matching conflict blocks across panels (blue for LOCAL-only, green for REMOTE-only, red for true conflicts)
• Non-conflicting auto-detection – blocks where only one side changed are shown in blue/green without a conflict badge and can be accepted in bulk with one click
• Syntax highlighting – context sections use highlight.js (PHP, JS/TS, Python, Java, Go, CSS, HTML, JSON, SQL, Bash, YAML, …)
• Editable RESULT panel – click any resolved block to edit the merged text directly
• Navigate conflicts – toolbar buttons or Alt+↑ / Alt+↓
• Keyboard shortcuts – Alt+← accept LOCAL, Alt+→ accept REMOTE
• Apply & git add – one click saves the resolved file and runs git add automatically
• diff3 support – detects three-way conflict markers including the common ancestor (BASE)

Open with context menu

Start editing

Usage

1. Open a file that contains git conflict markers (<<<<<<<)
2. Click the $(git-merge) icon in the editor title bar
   or right-click the file in the Explorer → Open in Merge Editor
3. Resolve conflicts by clicking the arrow buttons (→ / ←) or pressing Alt+← / Alt+→
4. Optionally click ⚡ Non-conflicting to auto-accept all unambiguous hunks
5. Click ✓ Apply Merge to save and stage the file

Keyboard shortcuts

Optional: enable diff3 style

By default git shows only two sides. To also see the common ancestor (BASE) in conflict markers:

git config --global merge.conflictstyle diff3

Color legend