#merge

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.

GitActions

Donkisoft

Run Git actions from the right-click menu: diff, log, history, blame, stash, merge, rebase, branches, remotes and more.

N-Way Compare & Merge

AmirRafiqBhat

Compare and merge N files side-by-side simultaneously with synchronized scrolling and visual alignment.

Gops - Visual Git Toolkit

codemanxdev

Visual Git Toolkit 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.

FlowScope BPMN

flowscope

Semantic BPMN diff, merge, modeler, and Camunda migration checks for VS Code.

Code Trio - Compare Beautify Spellcheck

AniketSoni

Compare, three-way merge, code-aware spell check, and beautify - in one offline extension. Prettier, Ruff, gofmt, rustfmt. No network calls, no telemetry.