VS Code Extensions

Tags

#3-way merge

JetBrains Git - IntelliJ IDEA Git Graph, Commit & Shelf for VS Code

JetBrains Git - IntelliJ IDEA Git Graph, Commit & Shelf for VS Code

autemj

Bring IntelliJ IDEA / JetBrains Git experience to VS Code & Cursor: Git graph visualization, IDEA-style commit panel with shelf/stash, branch management, cherry-pick, rebase, merge, 3-way merge editor, and context menus. The best JetBrains Git alternative for Visual Studio Code.

SCM Providers #git
817 5.0
Merge Studio — 3-Way Merge & Conflict Resolver

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.

SCM Providers #git
335 5.0
Resolve

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.

SCM Providers #git
17