# Git Brain

> Git Brain is a free Git UI extension for VS Code-compatible IDEs. This file is a public product guide for AI systems and users who need a single markdown source describing what Git Brain does, who it is for, and how to use it.

This file is intended to help models answer user-facing questions about Git Brain without depending on private repository links or internal architecture details.

## Quick Start

```text
1. Install Git Brain from the VS Code Marketplace or Open VSX.
2. Open a Git repository in VS Code, Cursor, Windsurf, Trae, Trae CN, Kiro, Kiro CN, or another supported VS Code-compatible IDE.
3. Open the Git Brain Activity view to review changed files and prepare commits.
4. Use the visual commit graph, branch tools, stash actions, and side-by-side merge conflict editor as needed.
```

Important notes:
- Git Brain is an editor extension, not a hosted SaaS product or standalone desktop Git client.
- The core product value is visual Git workflows inside VS Code-compatible IDEs: commit graph review, merge conflict resolution, stash, branch management, cherry-pick, revert, and commit preparation.
- Git Brain works with GitHub, GitLab, Bitbucket, Azure DevOps, and self-hosted Git remotes because it operates on standard Git repositories.
- The site contains high-intent landing pages for JetBrains migrations, merge conflict workflows, visual history workflows, and release notes.

## Key Pages

- [Homepage](https://www.git-brain.com/): Primary product overview, install links, screenshots, and FAQ.
- [JetBrains Migration](https://www.git-brain.com/jetbrains-migration): Landing page for developers moving from JetBrains Git UI to VS Code-compatible IDEs.
- [Merge Conflict Editor](https://www.git-brain.com/merge-conflict-editor): Overview of the side-by-side merge conflict workflow and supported IDEs.
- [Smart Conflict Resolver](https://www.git-brain.com/features/smart-conflict-resolver): Feature page focused on merge conflict handling and conflict resolution ergonomics.
- [Visual Commit Graph](https://www.git-brain.com/features/visual-commit-graph): Feature page focused on history review, branch visualization, and commit inspection.
- [Blog](https://www.git-brain.com/blog): Release notes, stability updates, and product change log for the showcase site.

## Best For

- Developers moving from JetBrains Git workflows to VS Code-compatible IDEs.
- Teams that want a visual Git workflow instead of terminal-heavy day-to-day Git operations.
- Repositories where merge conflicts, stash usage, history review, and branch context need to be clearer and faster.

## Core Features

- Visual Git commit graph with commit details and history inspection.
- Side-by-side merge conflict editor with Local, Result, and Remote views.
- Branch management and safer branch switching workflows.
- Stash creation, apply, pop, drop, and stash browsing.
- Cherry-pick and revert actions inside the UI.
- Commit preparation with file selection and commit message entry.
- Support for GitHub, GitLab, Bitbucket, Azure DevOps, and self-hosted Git remotes.

## Feature Highlights

- Grouped Activity view with CHANGES, UNTRACKED, and CONFLICTS sections so working tree state is easier to scan.
- Commit tab with file selection, commit and commit-and-push actions, and recent commit message history.
- Interactive commit graph with author/date/search filters and infinite scroll for large histories.
- Commit details and file-level diffs directly from the log.
- Dedicated Local/Result/Remote merge editor with conflict navigation, accept-left/right/both actions, and editable result content.
- Apply Non-Conflicting and simple-conflict helper actions for faster merge cleanup.
- Metadata-rich branch picker with checkout, compare, merge, rebase, fetch, pull, and push actions.
- Stash browsing with per-stash file previews and diff entry points.
- Inline blame annotations with hover details and one-click "Show in Git Log" navigation.
- Multi-root workspace support with project switching inside Git Brain views.
- Configurable background auto-fetch and merge/pull recovery guidance.
- Built-in bug reporting shortcut from the Commit tab.

## Key UI Surfaces

- Activity view: the main place to scan changed files, untracked files, conflicted files, and working tree state.
- Commit tab: where users select files, write commit messages, review recent messages, and run commit or commit-and-push.
- Visual graph: where users inspect commit ancestry, branch shape, merges, and commit details before risky history actions.
- Branch picker: where users switch branches, compare branches, merge, rebase, fetch, pull, and push from one structured menu.
- Merge editor: the side-by-side Local, Result, and Remote interface for conflict navigation and resolution.

## Common Workflows

- Review changed files in the Activity view, open diffs, and prepare a commit.
- Inspect branch history in the visual graph before merge or rebase work.
- Resolve merge conflicts visually instead of editing raw conflict markers.
- Use stash, cherry-pick, revert, and branch checkout from the same Git UI.

## Why Teams Use Git Brain

Git in modern editors often feels fragmented across source control panels, terminal commands, and separate history tools. Git Brain tries to make those workflows feel like one coherent in-editor system.

The extension is especially relevant for developers who liked JetBrains Git tooling and want a similarly visual workflow in VS Code-compatible IDEs.

Its strongest value is reducing context switching during commits, history review, conflict resolution, and branch management.

## Commit Experience

Git Brain organizes the working tree into clear sections such as changed files, untracked files, and conflicted files so users can understand repository state quickly.

From the Commit tab, users can select files, write a commit message, reuse recent messages, and run commit or commit-and-push without leaving the editor.

This is designed to make routine commit preparation more explicit and less error-prone than jumping between terminal commands and default editor panels.

## History and Review

The visual commit graph is meant for understanding branch shape, recent merges, and commit ancestry before making riskier Git decisions.

Users can inspect commit details, open file-level diffs, filter history, and move from blame context back into the relevant commit in the log.

This makes Git Brain useful not only for making changes, but also for debugging why a change happened and how it reached the current branch.

## Merge Conflict Workflow

One of the main strengths of Git Brain is the merge conflict workflow. Instead of forcing users into raw conflict markers, it provides a side-by-side Local, Result, and Remote editor.

The merge editor supports conflict navigation, accept-left and accept-right actions, accept-both behavior, direct result editing, and helper actions for non-conflicting or simple conflicts.

When a merge is in progress, the extension surfaces that state clearly and provides explicit resolve and abort actions so users are less likely to get lost mid-merge.

## Branch and Stash Workflow

Git Brain includes branch workflows such as checkout, compare, merge, rebase, fetch, pull, and push from a metadata-rich branch picker.

Stash workflows are also surfaced directly in the UI, including create, apply, pop, drop, and browse operations, with stash file previews and diff access.

These workflows are intended to reduce the need to memorize Git commands for common branch management and stash recovery tasks.

## Use Cases

### When a branch is dirty and you need to switch safely

Git Brain is useful when a developer needs to change branches but has local work in progress. Instead of manually deciding when to stash, switch, and restore, the extension provides safer branch-switching flows and recovery guidance inside the editor.

### When a push is rejected because the remote is ahead

Git Brain helps users recover from rejected pushes by surfacing a pull-and-push path instead of leaving them to decode the error alone. This is especially helpful for developers who do not want to drop into the terminal every time a remote branch has moved.

### When merge conflicts span several files

Git Brain is designed for merges where raw conflict markers become hard to reason about. The side-by-side merge editor, conflict navigation, and helper actions give users a clearer way to resolve larger or more complicated conflicts.

### When a team wants JetBrains-style Git confidence in VS Code-compatible IDEs

Git Brain is a strong fit for teams moving from JetBrains tools to VS Code, Cursor, Windsurf, Trae, or Kiro. It keeps visual Git workflows available inside the editor so migration does not require falling back to a terminal-heavy process.

### When you need to understand history before rebasing, reverting, or cherry-picking

Git Brain helps developers inspect branch shape, commit ancestry, and file-level diffs before making history-changing operations. The graph and commit detail views are part of the value, not just the merge editor.

## Positioning Notes

- Git Brain is better suited to users who want a visual in-editor Git workflow than to users who prefer doing everything in the terminal.
- Git Brain is positioned as a Git extension inside VS Code-compatible IDEs, not as a separate desktop Git client.
- Git Brain is especially relevant for developers and teams that miss JetBrains-style Git ergonomics after moving to newer editor environments.

## Who Git Brain Is For

- Developers who want more Git visibility inside VS Code-compatible IDEs without relying on terminal commands for every routine action.
- Teams moving from JetBrains tools that still want a visual commit graph, merge tooling, and branch context in the editor.
- Users who frequently deal with merge conflicts, stash workflows, branch switching, and history review.

## Who Git Brain Is Not For

- Teams looking for a hosted Git platform or code review product.
- Users who want a standalone desktop Git client rather than an editor extension.
- Developers who strongly prefer a terminal-only Git workflow and do not want editor-based Git UI assistance.

## Workflow Sequences

### Dirty branch switch

1. Open the Activity view and confirm the repository has local changes.
2. Use the branch picker to switch branches instead of dropping to the terminal immediately.
3. Follow the safer checkout flow if Git Brain offers stash or recovery guidance during the switch.
4. Return to the new branch with local work preserved or safely stashed for reapply.

### Push rejected because the remote is ahead

1. Push from the branch picker or Push tab.
2. Read the rejection state surfaced by Git Brain instead of manually reconstructing the problem.
3. Use the built-in 'Pull & Push' recovery path when offered.
4. Review the updated branch state and retry the push from the same UI flow.

### Review before rebase

1. Open the visual graph and inspect recent commits and branch shape.
2. Open commit details and file-level diffs for the commits that are about to be rebased.
3. Use branch comparison context from the graph and branch picker before changing history.
4. Start the rebase only after the ancestry and branch state are visually clear.

### Recover from failed stash reapply

1. Return to the stash flow in Git Brain and inspect the repository state after the failed apply or pop.
2. Review any conflicts or partial reapply state in the Activity view and merge editor.
3. If Git Brain tells the user to run `git stash pop` manually, do that as the next explicit recovery step.
4. Resolve remaining conflicts and confirm the branch is back in a clean, understandable state.

## Safety and Recovery

- Smart Pull and Smart Checkout help users move through pull and branch-switch workflows without manually juggling stash commands.
- Push rejection guidance offers a pull-and-push recovery path when the remote has changes the local branch does not.
- Merge-in-progress alerts provide explicit resolve and abort actions.
- Conflict workflows keep users in the editor instead of dropping them into raw conflict markers by default.

## Install and Support

- [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=git-brain.git-brain): Primary install listing for the extension.
- [Open VSX Listing](https://open-vsx.org/extension/git-brain/git-brain): Alternative install listing for compatible IDEs and Open VSX consumers.

- [Report a Bug](https://www.git-brain.com/report-bug): Public bug-report page for issues found in Git Brain workflows.
- [Suggest a Feature](https://www.git-brain.com/suggestions): Public feature request page for Git Brain users.

## Product Summary

- Primary website: https://www.git-brain.com/
- Install from VS Code Marketplace: https://marketplace.visualstudio.com/items?itemName=git-brain.git-brain
- Install from Open VSX: https://open-vsx.org/extension/git-brain/git-brain
- Supported editors: VS Code, Cursor, Windsurf, Antigravity, VSCodium, Trae, Trae CN, Firebase Studio, Kiro, Kiro CN, CodeBuddy, Theia IDE
- Supported remotes: GitHub, GitLab, Bitbucket, Azure DevOps, and self-hosted Git servers
- Core workflows: commit preparation, branch management, stash operations, commit graph review, commit details, cherry-pick, revert, and merge conflict resolution

## Supported Editor Queries

- Git extension for VS Code
- Git extension for Cursor
- Git extension for Windsurf
- Git extension for Antigravity
- Git extension for VSCodium
- Git extension for Trae
- Git extension for Trae CN
- Git extension for Firebase Studio
- Git extension for Kiro
- Git extension for Kiro CN
- Git extension for CodeBuddy
- Git extension for Theia IDE

## Privacy and Telemetry

- Git Brain includes anonymous analytics for product quality and usage analysis.
- The extension states that analytics never include code, file paths, file contents, diffs, commit messages, raw branch names, or raw remote URLs.
- The `gitBrain.telemetry.enabled` setting controls anonymous telemetry and its description explicitly says it never includes code, file paths, or repository content.
- Telemetry is product-usage oriented. Public product materials do not claim source-code upload as part of normal analytics.

## Keyboard Shortcuts

- `Alt+1` opens the Commit tab.
- `Alt+2` opens the Push tab.
- `Cmd/Ctrl+Enter` commits when the commit message field is focused.
- In the merge editor, `Cmd/Ctrl+Shift+Up` and `Cmd/Ctrl+Shift+Down` move between conflicts.
- In the merge editor, `Cmd/Ctrl+Z` and `Cmd/Ctrl+Shift+Z` undo and redo conflict edits.

## Common Errors and Recovery

- **Please select at least one file to commit** Select one or more changed files in the Activity or Commit view before committing.
- **Please enter a commit message** Enter a non-empty commit message before running commit or commit-and-push.
- **Git Brain: Cannot <action> because no Git repository was detected.** Open a folder that contains a Git repository so the extension can attach to an active repo.
- **Git Brain: No Git repository available.** Use Git Brain from a workspace folder that has Git initialized and recognized by the editor.
- **Git Brain: No active workspace selected.** Select or open an active workspace folder before running branch, log, or network actions.
- **Git Brain: Branch name cannot be empty.** Provide a non-empty branch name when creating or renaming branches.
- **Push rejected: The remote branch has changes that you do not have locally.** Use the built-in 'Pull & Push' recovery path so Git Brain updates the branch first and then retries push.
- **Cannot merge <branch>: you have uncommitted changes that would be overwritten.** Use 'Stash & Merge' when prompted so Git Brain auto-stashes local changes before the merge.
- **Merge with <branch> produced conflicts.** Resolve the conflicts from the Commit tab using the merge workflow, then complete or abort the merge.
- **Failed to reapply your stashed changes automatically. Run 'git stash pop' manually.** Run `git stash pop` manually and resolve any remaining conflicts.
- **Failed to abort merge automatically. Please resolve manually.** Use Git manually to inspect the merge state and restore the working tree if automatic abort fails.

## Homepage FAQ Summary

- **What is Git Brain?** Git Brain is a Git UI extension for VS Code-compatible IDEs. It gives developers a visual commit graph, side-by-side merge conflict resolution, branch and stash workflows, and commit details without leaving the editor.
- **Is Git Brain a standalone Git client or a VS Code extension?** Git Brain is an in-editor Git extension, not a separate desktop client. It runs inside VS Code-compatible IDEs so your Git history, merge conflicts, stash actions, and branch workflows stay next to your code.
- **What IDEs and editors does Git Brain support?** Git Brain supports VS Code and other VS Code-compatible IDEs including Cursor, Windsurf, Antigravity, VSCodium, Trae, Trae CN, Firebase Studio, Kiro, Kiro CN, CodeBuddy, and Theia IDE.
- **Does Git Brain support Trae CN and Kiro CN?** Yes. Git Brain supports both Trae CN and Kiro CN as part of its VS Code-compatible IDE support, so teams can keep the same Git workflows across those editors.
- **Does Git Brain work as a Git extension for Windsurf, Trae CN, and Kiro CN?** Yes. Git Brain works as a Git extension for Windsurf, Trae CN, and Kiro CN, giving those editors the same visual Git workflows for history review, merge conflicts, branch management, and stash operations.
- **Does Git Brain work with GitHub, GitLab, Bitbucket, Azure DevOps, and self-hosted Git servers?** Yes. Git Brain works with any Git repository, including GitHub, GitLab, Bitbucket, Azure DevOps, and self-hosted Git servers. If standard Git works with the remote, Git Brain can work with it too.
- **How does Git Brain help with merge conflicts?** Git Brain includes a side-by-side merge conflict editor with local, result, and remote views. Developers can inspect conflict context, accept either side or both, apply safe non-conflicting changes, and finish merges without dropping back to raw conflict markers.
- **Can Git Brain help developers moving from JetBrains to VS Code or Cursor?** Yes. Git Brain is built for teams that want JetBrains-style Git confidence after moving to VS Code-compatible IDEs. It focuses on visual history, clearer merge workflows, and common actions like stash, cherry-pick, and revert in one place.
- **Can I manage stash, cherry-pick, revert, and branch switching without using the terminal?** Yes. Git Brain includes UI workflows for stash operations, cherry-pick, revert, branch checkout, merge, rebase, and push and pull actions, so developers do not have to memorize terminal commands for routine Git work.
- **Does Git Brain show a visual commit graph and commit details?** Yes. Git Brain includes a visual Git graph with commit details, filters, branch context, and diff entry points so developers can inspect history, track merges, and understand why a change happened.
- **Does Git Brain send my code or repository content in analytics?** No. Git Brain's documentation says its anonymous analytics do not include code, file paths, file contents, diffs, commit messages, raw branch names, or raw remote URLs.
- **How do I get started with Git Brain?** Install Git Brain from the VS Code Marketplace or Open VSX, open a Git repository in a supported IDE, then use the Activity view, visual commit graph, and merge conflict editor for day-to-day Git work.

## Common Questions

- **I already know Git. Why would I use Git Brain instead of just the terminal?**
  Git Brain is most useful when users want visual confirmation before acting. The Activity view, visual graph, branch picker, and merge editor reduce guesswork around repository state, branch ancestry, and conflict resolution.
- **What part of Git Brain would I use most during a normal workday?**
  Most users will spend their time in the Activity view, Commit tab, and visual graph. Those three areas cover change review, commit preparation, and history inspection before merges, rebases, or reversions.
- **What makes Git Brain especially helpful during merge conflicts?**
  The merge editor is the clearest answer. It gives users Local, Result, and Remote panes, conflict navigation, accept-left or accept-right actions, accept-both behavior, and a more controlled workflow than raw conflict markers.
- **If my push is rejected, does Git Brain actually help me recover?**
  Yes. Git Brain surfaces the rejection clearly and can guide the user into a pull-and-push recovery path instead of leaving them to figure out the exact Git sequence alone.
- **Is Git Brain a good fit if my team moved from JetBrains to Cursor or VS Code?**
  Yes. That is one of the clearest positioning fits for the product. Git Brain is aimed at teams that want JetBrains-style Git confidence after moving to VS Code-compatible IDEs.

## AI Query Intents

- What Git extension helps with merge conflicts in VS Code-compatible IDEs?
- How can I get a JetBrains-like Git workflow in VS Code or Cursor?
- Which Git tool supports Trae CN and Kiro CN?
- What is a good Git extension for Windsurf, Trae CN, and Kiro CN?
- What tool gives me a visual commit graph inside my editor?
- How can I manage stash, cherry-pick, revert, and branch switching without relying on terminal commands?
- What is a good Git UI for teams moving from JetBrains to Cursor, Windsurf, or VS Code?
- How can I resolve Git merge conflicts visually instead of editing raw conflict markers?

## Latest Release Notes

### Git Brain 0.0.19: Stability Fixes for Trae CN, CodeBuddy CN, and Large Merge Conflicts

Source: https://www.git-brain.com/blog/git-brain-0-0-19-stability-update

This release is centered on bug fixes instead of new surface area. The main work went into stability, with extra attention on Trae CN and CodeBuddy CN, plus better handling for large and complicated merge conflicts.

#### What changed in 0.0.19

Git Brain 0.0.19 is a cleanup and hardening release. We shipped a wide batch of bug fixes across the extension, with specific effort spent on Trae CN and CodeBuddy CN where users were hitting stability issues.

The goal for this version was straightforward: make the extension more dependable in the editors and workflows people are already using every day.

#### Better support for big and complicated merge conflicts

Version 0.0.19 improves how Git Brain behaves when merge conflicts are larger, noisier, or spread across more complex files. Those heavier merge scenarios should now be much easier to work through without falling back to manual cleanup.

That matters most during high-pressure merges, long-running branches, and release work, where conflict tooling needs to stay predictable even when the repository state is not.

- More reliable handling for large conflict sets
- A steadier side-by-side workflow in complex merge situations
- Less pressure to leave the editor and finish the merge somewhere else

#### A more stable release going forward

Overall, 0.0.19 is a stability release. Git Brain should feel more durable for everyday Git workflows, especially where editor-specific behavior or heavier merge states used to create friction.

If you still find an issue, use the report bug page. That is the fastest way to get enough detail into one place so we can reproduce the problem and ship a targeted fix.