#merge

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.

GitCharm

RioNoir

JetBrains-like Git management for VS Code — Commit panel, Git Log with graph, multi-repo support and more.

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.

TIA VCI Viewer

jb-automation

Siemens TIA Portal Version Control Interface (VCI) viewer for VS Code: structured preview, semantic Git diff, merge, and rename for PLC exports — XML, SCL, SIMATIC SD (.s7dcl, .udt, .db, .s7res). By JB Automation — not affiliated with Siemens.

SVN 管理

lande

图形化 SVN 工作副本管理面板：工作区、分支、日志、合并与常用配置

Git Branches Panel

karolis-mauragas

Tree view for branches, tags, stashes, worktrees, hooks, and remotes across one or multiple Git repositories with grouping, search, filtering, compare/history workflows, remote host integration, worktree maintenance, sync state, and quick actions.

PDF Architect

AppsArchitect

Lightning-fast PDF editor built natively into VS Code. Merge, split, sign, and export PDFs instantly.

GitWand

Gitwand

Git's magic wand — automatic conflict resolution for VS Code

Diff Files

gustaferiksson

Quickly diff the active file against any open, unsaved, or workspace file.

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.

Git Simple Compare

newdlops

Compare git branches, review editable diffs, resolve conflicts, and create AI commit plans and messages.