
Managing Branches
- 1 installs
- 404 repo stars
- Updated August 5, 2026
- aiskillstore/marketplace
managing-branches is a Claude Code skill that investigates Git branch status and creates new branches, with error and conflict handling.
About
managing-branches is a Claude Code skill that investigates and creates Git branches. A developer uses it to check branch status (current branch, uncommitted changes, remote sync, commits ahead of main), create a new branch from a base, and handle common branch errors and merge conflicts. It runs standard git commands and reports the results.
- Investigates and creates Git branches
- Reports current branch, uncommitted changes and remote sync status
- Includes error-handling and conflict-resolution steps
Managing Branches by the numbers
- 1 all-time installs (skills.sh)
- Ranked #527 of 733 Git & Pull Requests skills by installs in the Skillselion catalog
- Data as of Aug 5, 2026 (Skillselion catalog sync)
managing-branches capabilities & compatibility
- Capabilities
- branch investigation · branch creation · conflict resolution
What managing-branches says it does
Investigates and creates Git branches.
Report: current branch, uncommitted changes, remote sync status, commits ahead of main.
npx skills add https://github.com/aiskillstore/marketplace --skill managing-branchesAdd your badge
Show developers this skill is listed on Skillselion. Paste this into your README.
| Installs | 1 |
|---|---|
| repo stars | ★ 404 |
| Last updated | August 5, 2026 |
| Repository | aiskillstore/marketplace ↗ |
What it does
Check Git branch status and create new branches with error and conflict handling.
Who is it for?
Checking Git branch status and creating branches safely
When should I use this skill?
Checking branch status, creating a new branch, or hitting branch-related errors
What you get
- new Git branch
- branch status report
By the numbers
- 4-row error-handling table
- 4-step conflict-resolution procedure
Files
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 nameReport: 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
1. git status to identify conflicts 2. Resolve each file 3. git add <resolved-file> 4. Continue operation
Ask for guidance if resolution is complex.
Completion Report
- Current branch name
- Branch creation result (if applicable)
- Any issues encountered
{
"schema_version": "2.0",
"meta": {
"generated_at": "2026-01-16T14:07:23.606Z",
"slug": "1gy-managing-branches",
"source_url": "https://github.com/1gy/jpp/tree/main/.claude/skills/managing-branches",
"source_ref": "main",
"model": "claude",
"analysis_version": "3.0.0",
"source_type": "community",
"content_hash": "9677ae5682a3dbacf24d627ab10b87c336d361e49430aef1adb276558d8fdaf3",
"tree_hash": "f7eeba1e1f4132777b06e1025f67ed84b877fb746f2928c90ddff2bc80140b83"
},
"skill": {
"name": "managing-branches",
"description": "Investigates and creates Git branches. Triggered when: branch status check, new branch creation, branch-related errors.\n",
"summary": "Investigates and creates Git branches. Triggered when: branch status check, new branch creation, bra...",
"icon": "🔀",
"version": "1.0.0",
"author": "1gy",
"license": "MIT",
"category": "coding",
"tags": [
"git",
"branches",
"version-control",
"collaboration"
],
"supported_tools": [
"claude",
"codex",
"claude-code"
],
"risk_factors": [
"external_commands"
]
},
"security_audit": {
"risk_level": "safe",
"is_blocked": false,
"safe_to_publish": true,
"summary": "This is a prompt-based Git utility skill with no malicious code. The static scanner incorrectly flagged multiple findings: the 'weak cryptographic algorithm' detections are false positives (the scanner misidentified strings like 'managing-branches' and 'Quick branch status check' as crypto references). The 'external_commands' findings show standard Git commands (git branch, git status, git checkout) that are safe for a branch management skill. The 'filesystem' and 'network' findings are metadata strings, not actual access calls. The skill only uses safe Git commands and does not perform destructive operations.",
"risk_factor_evidence": [
{
"factor": "external_commands",
"evidence": [
{
"file": "SKILL.md",
"line_start": 11,
"line_end": 17
}
]
},
{
"factor": "external_commands",
"evidence": [
{
"file": "SKILL.md",
"line_start": 23,
"line_end": 26
}
]
}
],
"critical_findings": [],
"high_findings": [],
"medium_findings": [],
"low_findings": [],
"dangerous_patterns": [],
"files_scanned": 2,
"total_lines": 262,
"audit_model": "claude",
"audited_at": "2026-01-16T14:07:23.605Z"
},
"content": {
"user_title": "Investigate and create Git branches",
"value_statement": "Managing Git branches can be confusing, especially when dealing with errors or sync issues. This skill automates branch investigation and creation while handling common problems like conflicts and uncommitted changes.",
"seo_keywords": [
"git branches",
"branch management",
"git workflow",
"branch creation",
"git status",
"Claude",
"Codex",
"Claude Code",
"version control",
"git commands"
],
"actual_capabilities": [
"Investigate current branch and repository status",
"Check remote sync status and commits ahead",
"Create new branches from base branches",
"Handle branch-related errors automatically",
"Resolve merge conflicts with step-by-step guidance",
"Report branch operations and any issues encountered"
],
"limitations": [
"Does not delete or force delete branches",
"Does not push branches to remote automatically",
"Complex merge conflicts require user guidance",
"Does not manage branch protection rules"
],
"use_cases": [
{
"target_user": "Developers",
"title": "Quick branch status check",
"description": "Get a summary of current branch, uncommitted changes, and sync status"
},
{
"target_user": "Team leads",
"title": "Branch creation workflow",
"description": "Create feature branches following naming conventions with error handling"
},
{
"target_user": "New developers",
"title": "Git learning aid",
"description": "Learn git branch operations with guided error resolution steps"
}
],
"prompt_templates": [
{
"title": "Check current branch",
"scenario": "When user wants to see branch status",
"prompt": "Check the current branch status. Show me the current branch, any uncommitted changes, and how up-to-date it is with the main branch."
},
{
"title": "Create feature branch",
"scenario": "When user needs a new branch",
"prompt": "Create a new branch called feature/my-feature-name from the main branch. Make sure the main branch is up to date first."
},
{
"title": "Handle branch errors",
"scenario": "When branch operations fail",
"prompt": "I got an error when trying to work with branches. Help me resolve it. The error was: [describe error]"
},
{
"title": "Resolve conflicts",
"scenario": "When merge conflicts occur",
"prompt": "Help me resolve merge conflicts in my current branch. First show me what files have conflicts, then guide me through resolving them."
}
],
"output_examples": [
{
"input": "Check the current branch status",
"output": [
"Current branch: feature/new-api",
"Uncommitted changes: 3 files modified",
"Remote sync: 2 commits ahead of main",
"Remote branches: origin/main is up to date",
"Recommended action: Consider committing or stashing changes before continuing"
]
},
{
"input": "Create a feature branch from main",
"output": [
"Fetching latest changes from origin main",
"Creating new branch feature/user-auth from main",
"Branch created successfully",
"Switched to new branch feature/user-auth",
"No conflicts detected during creation"
]
}
],
"best_practices": [
"Always fetch from remote before creating or updating branches",
"Stash or commit uncommitted changes before switching branches",
"Verify branch naming conventions match team standards"
],
"anti_patterns": [
"Creating branches with spaces or special characters in names",
"Force pushing to shared branches without team approval",
"Ignoring merge conflicts and leaving them unresolved"
],
"faq": [
{
"question": "Does this skill work with GitHub, GitLab, and Bitbucket?",
"answer": "Yes, it works with any Git hosting service since it uses standard Git commands."
},
{
"question": "What happens if I try to create a branch that already exists?",
"answer": "The skill detects the conflict and reports it, suggesting alternatives or confirming use of the existing branch."
},
{
"question": "Can I use this with GitHub CLI for pull requests?",
"answer": "The skill uses Git commands. GitHub CLI integration would require a separate skill."
},
{
"question": "Is my repository data safe with this skill?",
"answer": "Yes, the skill only reads repository state and creates branches. No deletion or force operations."
},
{
"question": "What if I have complex merge conflicts?",
"answer": "The skill provides step-by-step guidance for simple conflicts and asks for guidance on complex ones."
},
{
"question": "How is this different from Git aliases?",
"answer": "This skill provides intelligent error handling and guidance that static aliases cannot match."
}
]
},
"file_structure": [
{
"name": "SKILL.md",
"type": "file",
"path": "SKILL.md",
"lines": 51
}
]
}