ConflictSolver — Visual Merge Conflicts

Replace plain conflict markers with a visual 3-way diff. One-click accept ours/theirs, conflict badges, and AI-style smart resolution with Pro.

Downloads

Rating

— (0)

Version

1.0.0

Last updated

Jun 09, 2026

SCM Providers #git #keybindings #diff #rebase #merge #conflict

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.

Related extensions

Agentforce Vibes Autocomplete

salesforce

AI-powered code completions for Salesforce development

Other #keybindings

60,773

Antigravity for VS Code

lyadhgod

Bring Google's Antigravity CLI (agy) into VS Code: an agentic coding companion with a Material 3 Expressive chat UI, a slash-command navigator, interactive sessions with in-chat option pickers, and Google sign-in.

AI Chat #ai

38,533 3.3

ABAP Development Tools for VS Code

SAPSE

The official ABAP development tools for your preferred editor, with integrated AI support.

Programming Languages #keybindings

30,740 2.9

Grok Build for VS Code (Community)

PawelHuryn

GUI for Grok Build CLI (incl. Grok 4.6). Remote Control from your phone, voice control, multiple sessions, images and videos, Mermaid diagrams, and LaTeX. Works with SuperGrok, X Premium+, and xAI API key. Fair Source (FSL-1.1-MIT). Not affiliated with or endorsed by SpaceXAI (formerly xAI).

AI Chat #ai

23,819 5.0