Skip to content

aspiers/ai-config / .agents/skills/git-branch-management

git-branch-management

Verified

Structures git branches and worktrees: keeps unrelated changes on separate branches, isolates each in its own worktree created so the repository's setup runs, records dependencies with git-machete, and recombines them into a temporary mixdown branch for local testing. Use when starting any fix or change, diagnosis included, in a codebase that works on more than one branch or in a fork, clone or third-party checkout, before reading code for it; before creating any branch or worktree; when choosing what a new branch should be based on; when a branch is growing a second unrelated concern; when deciding whether to stack branches or keep them independent; when preparing a change for a pull request or patch submission; when handed an existing worktree or branch to implement and commit in a fork; or when a local build needs several in-progress branches combined. Not needed where the repository clearly commits everything to the trunk, or holds notes or personal data rather than code.

Indexed versions of this skill
CommitIndexedFilesContent hash
b89bda9current2026-11-171 · 14.9 KB55d9bb4757dc41e0…
finishing-a-development-branchobra/superpowersUse when implementation is complete, all tests pass, and you need to decide how to integrate the workStars: 322kUpdated Claude CodeCodexVerifiedInstall
systematic-debuggingobra/superpowersUse when encountering any bug, test failure, or unexpected behavior, before proposing fixesStars: 322kUpdated Claude CodeCodexVerifiedInstall
test-driven-developmentobra/superpowersUse when implementing any feature or bugfix, before writing implementation codeStars: 322kUpdated Claude CodeCodexVerifiedInstall
skill-creatoranthropics/skillsCreate new skills, modify and improve existing skills, and measure skill performance. Use when users want to create a skill from scratch, edit, or optimize an existing skill, run evals to test a skill, benchmark skill performance with variance analysis, or optimize a skill's description for better triggering accuracy.Stars: 198kUpdated Claude CodeCodexVerifiedInstall