#conflict
GitWand
Gitwand
Git's magic wand — automatic conflict resolution for VS Code
Conflict Lens
Masa-Shin
Visualize files and lines where your edits could conflict with the base branch.
Git Peak — Visual Source Control & Commit Graph
NotifyX
Git visual workspace for VS Code — a real commit graph, one-click conflict resolution, and safe everyday Git version control. Works with GitHub, GitLab, Bitbucket, and self-hosted Gitea. No telemetry, fully offline-capable.
gitfix — Merge Conflict Inspector
ameyypawar
Workspace-wide merge conflict inspector and companion to VS Code's built-in merge editor. Powered by gfix MCP.
Merge Resolver
tofilagman
IntelliJ-style 3-way merge conflict resolver — Yours | Result | Theirs side-by-side, apply non-conflicting changes in one click.
Merge Magic — AI Conflict Resolver
laksh-mishra
Auto-resolves merge conflicts and surfaces real intent decisions for human review. Works in VS Code AND as a standalone git merge driver (any terminal). Multi-backend (Copilot, Claude, GPT, Gemini, Ollama). Never auto-commits.
MergeForge — JetBrains-style Conflict Resolver
byte-forge
Resolve Git merge conflicts in a JetBrains/WebStorm-style three-pane visual merge editor.
MergePro
ismailcherri
IntelliJ-style three-pane merge conflict resolver for VS Code.
ConflictSolver — Visual Merge Conflicts
mjethwa-streamlit
Replace plain conflict markers with a visual 3-way diff. One-click accept ours/theirs, conflict badges, and AI-style smart resolution with Pro.
Resolve
cssrno
IntelliJ-style 3-way merge editor and 2-pane diff viewer with bezier pipes. Auto-collapses unchanged regions, breadcrumb hovers, scoped chevron actions, rebase / merge context headers.
ExtSherlock — Extension Doctor
AnandShah
Diagnoses slow, conflicting, and resource-hungry VS Code extensions in real time, and tells you exactly what to disable and why.
SF Deploy Guard
angelPicado
Deploy with confidence. Get warned before overwriting a teammate's Salesforce changes - who changed it, when, and what to do next.