ConflictSolver — Visual Merge Conflicts

Replace VSCode's plain conflict markers with a visual 3-way diff panel showing yours, theirs, and the common base. Resolve with one click.

Free

• Visual 3-way diff panel for conflicts
• One-click Accept Ours / Accept Theirs / Accept Both
• Conflict count badge + warning diagnostics
• Jump to next conflict (Ctrl/Cmd+Shift+K Ctrl/Cmd+Shift+N)

Pro

• Smart Resolve — best-guess resolution with a confidence score
• Batch resolve low-risk conflicts (whitespace, import order)

Get a Pro key at marketplace.dashovia.com/extensions/conflict-solver.

See full documentation at marketplace.dashovia.com.