managing-branches
Investigates and creates Git branches. Triggered when: branch status check, new branch creation, branch-related errors.
When & Why to Use This Skill
This Claude skill automates Git branch management and repository investigation, streamlining version control workflows for developers. It enables the AI to check branch status, create new branches from remote bases, and intelligently handle common Git errors such as uncommitted changes or merge conflicts, ensuring a smooth and efficient coding environment.
Use Cases
- Automated Feature Branching: Quickly create new development branches from the latest remote origin, ensuring developers always start from the most up-to-date codebase.
- Repository Status Auditing: Investigate the current state of a local repository, including tracking uncommitted changes, remote synchronization status, and ahead/behind commit counts.
- Intelligent Error Recovery: Automatically resolve common Git hurdles like 'branch already exists' or 'uncommitted changes' by suggesting stashes, commits, or alternative branch names.
- Conflict Resolution Support: Identify files with merge conflicts during branch operations and provide a structured report to guide the user through the resolution process.
| name | managing-branches |
|---|---|
| description | > |
| Triggered when | branch status check, new branch creation, branch-related errors. |
| allowed-tools | Bash(git:*) |
Branch Investigation
git branch --show-current
git status --short
git fetch --all
git branch -vv
git rev-list --count <main-branch>..HEAD 2>/dev/null || echo "0" # Check CLAUDE.md for main branch name
Report: current branch, uncommitted changes, remote sync status, commits ahead of main.
Branch Creation
git fetch origin <base-branch>
git checkout -b <new-branch> origin/<base-branch>
Error Handling
| Error | Action |
|---|---|
| Branch exists | Report to user, suggest alternative or confirm use existing |
| Uncommitted changes | git stash or commit first |
| Remote sync error | git fetch --all retry |
| Permission error | Report to user |
Conflict Resolution
git statusto identify conflicts- Resolve each file
git add <resolved-file>- Continue operation
Ask for guidance if resolution is complex.
Completion Report
- Current branch name
- Branch creation result (if applicable)
- Any issues encountered