Marketplace managing-branches

Name: managing-branches
Author: aiskillstore

install

source · Clone the upstream repo

git clone https://github.com/aiskillstore/marketplace

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/aiskillstore/marketplace "$T" && mkdir -p ~/.claude/skills && cp -r "$T/skills/1gy/managing-branches" ~/.claude/skills/aiskillstore-marketplace-managing-branches && rm -rf "$T"

manifest: skills/1gy/managing-branches/SKILL.md

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 status
```
to 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