#rebase

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.

IntelliGit — Visual Git Log & Rebase

ArisNgoy

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

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.

Restack

FelixZhang

Drag to reorder GitHub stacked PRs. Shows the exact git rebase plan before running it, and can undo. Requires the gh CLI with gh-stack.

A JetBrains-inspired Git experience for VSCode

BranchShift — JetBrains-style Git for VS Code

vitalhex

Keep your JetBrains-style Git workflow in VS Code and Cursor with Git graph, commit and shelf tools, branch comparison, rebase, merge, conflicts, and multi-repo support.

Organize git work with changelists, a visual commit graph, inline blame, branch manager, interactive rebase, and merge conflict tools for VS Code-based editors.

Git Visual Novel

QuantumNovice

Learn and manage Git visually with an animated command center, branch map, commit history, repository XP, achievements, and safety warnings.

Beautiful Git

denkovalsky

Fast commit graph, branch management, merge & interactive rebase tooling for VS Code

Git4VSC

Listen

Focused Git commit, log, branch, worktree, push preview, conflict, blame, and AI workflows for VS Code.

GI Pro

iammanhloi

Git workflows for VS Code with a visual log, file history, selection history, inline blame, and quick Git actions.

GitCanvas — See What Git Is Thinking

saiudayagiri

See what Git is thinking — an interactive commit graph, working-tree pipeline, merge/rebase simulators, reflog, and blame that run real git commands, right inside VS Code.