Advanced Merge Conflict Resolver

A Visual Studio Code extension that provides a three-way merge conflict editor comparable to JetBrains' Merge Revisions UI.

Features

Three-Pane Diff View: Side-by-side comparison with Local (Yours), Merge Result (editable), and Incoming (Theirs) panes
Visual Conflict Highlighting: Color-coded conflicts with visual connectors between panes
Quick Resolution Actions: Accept Left, Accept Right, Accept Both with inline buttons and keyboard shortcuts
Conflict Navigation: Jump between conflicts with keyboard shortcuts and sidebar list
Git Integration: Automatically detects merge conflicts and resolves them cleanly
Performance Optimized: Handles large files efficiently

When Git merge conflicts are detected, use the command palette: Resolve Merge Conflicts (Advanced)
Use keyboard shortcuts to resolve conflicts:
- Ctrl/Cmd + Shift + ←: Accept Left (Local)
- Ctrl/Cmd + Shift + →: Accept Right (Incoming)
- Ctrl/Cmd + Shift + ↓: Accept Both
- Alt + F9: Next Conflict
- Alt + Shift + F9: Previous Conflict

MIT