⚔️
ConflictSolver
Visual 3-way merge conflict resolution with AI suggestions
The Problem
Merge conflicts in large files mean manually reading three versions line by line. One wrong choice breaks the build.
About
Replaces VSCode's plain conflict markers with a visual diff panel showing yours, theirs, and base. Suggests the most likely correct resolution based on surrounding context.
Free vs Pro
FREEVSCode Marketplace
- ✓Visual 3-way diff panel for conflicts
- ✓One-click accept ours / accept theirs
- ✓Conflict count badge in file tree
PROEverything in Free +
- ✦AI-suggested resolution with confidence score
- ✦Conflict history — see how similar conflicts were resolved before
- ✦Batch resolve low-risk conflicts (whitespace, import order)
- ✦Team conflict patterns library
Pro License
$29/ lifetime
or $14/year
- ✓ Lifetime updates included
- ✓ Activate on up to 3 devices
- ✓ License key — no account needed
- ✓ 30-day refund guarantee
Secure checkout via Polar.sh
More in Git & Version Control