Menú
Use when starting new work, managing branches, or finishing features. Covers branch creation, commit discipline, and merge workflows.
Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.
Basado en la clasificación ocupacional SOC
Use when starting a new feature, design change, or architecture decision. Explores approaches and tradeoffs before planning or coding. NEVER skip this for non-trivial work.
Use when executing an implementation plan. Each step is delegated to a fresh subagent for isolated context, then reviewed before proceeding. Do NOT execute plans inline — use subagents.
Use when implementation is complete and you need to decide how to integrate the work - guides completion by presenting structured options for merge, PR, or cleanup
Use when creating implementation plans. Breaks work into small, verifiable steps with exact file paths and verification commands. Use after brainstorming approval.
Use when you receive code review feedback (from a reviewer subagent, /review command, or human). Guides proper processing of feedback without dismissing or cherry-picking.
Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes
| name | git-workflow |
| description | Use when starting new work, managing branches, or finishing features. Covers branch creation, commit discipline, and merge workflows. |
| Excuse | Why It's Wrong | Do This Instead |
|---|---|---|
| "It's a small change, I'll commit to main" | Small changes can still break things and are hard to revert | Branch for anything touching 3+ files |
| "I'll commit at the end" | Large commits are hard to review and revert | Commit after each logical unit |
| "WIP" as a commit message | Meaningless to future readers | Describe WHAT and WHY, even briefly |
| "I'll clean up the history later" | You won't. Write good messages now | Take 10 seconds to write a real message |
| "Tests pass locally, let me push" | Was a review done? | Run /review before pushing |
Create a feature branch for:
Stay on current branch for:
<type>/<short-description>
feat/add-auth-middleware
fix/null-pointer-in-parser
refactor/extract-validation-logic
git checkout -b feat/description
<type>: <short description>
<body explaining what and why>
Types: feat, fix, refactor, test, docs, chore
Before considering any branch finished:
npm test, cargo test, etc.)/review)Present these options to the human:
Merge — git checkout main && git merge --no-ff feat/branch
--no-ff to preserve branch historyPR — Push and create a pull request
git push -u origin feat/branchgh pr create --title "..." --body "..."Keep — Leave the branch for later
Discard — Delete the branch entirely
git checkout main && git branch -D feat/branch