#merge conflict

Merge Studio — 3-Way Merge & Conflict Resolver

gitstudio

A beautiful 3-way merge conflict editor for VS Code & Cursor: resolve conflicts with color ribbons and one-click accept arrows, a conflicts dashboard, undo history, and a precise side-by-side diff — with optional one-click hand-off to an installed JetBrains IDE.

GitStudio — JetBrains-style Git Graph, Blame & Merge

gitstudio

Free, open-source Git GUI & commit graph for VS Code and Cursor. Git Studio brings a JetBrains-style Git workflow into the editor — inline blame, file history, hunk & line staging, 3-pane merge, interactive rebase with universal Undo, stash/shelf, worktrees, and in-editor GitHub PRs. A free alternat

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 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.

HydraGit

vkushnarenko

An IntelliJ-style git panel for VS Code — branches, history, and diff in one place. No paywall.

IntelliGit — Visual Git Log & Rebase

ArisNgoy

JetBrains-style Git for VS Code: Commit, Log, Branches, Stash, Interactive Rebase, and 3-way conflict resolution.

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.

Git Workspace Pro

jinhy

A multi-repository Git workspace manager for VS Code.

DriftGuard

KanaihyaKumar

See which lines in the file you are editing were changed on other git branches, so you can spot overlap and avoid merge conflicts before they happen.