Skip to content

aiskillstore/marketplace / skills/1gy/managing-branches

managing-branches

Verified

Investigates and creates Git branches. Triggered when: branch status check, new branch creation, branch-related errors.

FileKindSize
SKILL.mdskill md1.2 KB
skill-report.jsonconfig14.5 KB
---
name: managing-branches
description: >
  Investigates and creates Git branches.
  Triggered when: branch status check, new branch creation, branch-related errors.
allowed-tools: Bash(git:*)
---

# Branch Investigation

```bash
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

```bash
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
receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementationStars: 323kUpdated Claude CodeCodexVerifiedInstall
requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirementsStars: 323kUpdated Claude CodeCodexVerifiedInstall
using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallbackStars: 323kUpdated Claude CodeCodexVerifiedInstall
verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions alwaysStars: 323kUpdated Claude CodeCodexVerifiedInstall