#conflict resolution
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.
SCM Providers
#git
61
5.0
gitfix — Merge Conflict Inspector
ameyypawar
Workspace-wide merge conflict inspector and companion to VS Code's built-in merge editor. Powered by gfix MCP.
Linters
SCM Providers
#git
41
4.7
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.
SCM Providers
Visualization
#git
13
Git4VSC
Listen
Focused Git commit, log, branch, worktree, push preview, conflict, blame, and AI workflows for VS Code.
SCM Providers
Visualization
#git
9