Skill git-flow
Use when creating a branch, using worktrees for parallel work, committing, or wrapping up. Covers branch naming, conventional commits, short-lived branches, worktree isolation, and final merge/cleanup.
- Estrellas en GitHub
- 25
- Archivos
- 1
- Último commit
- 15 sept 2026
- Licencia
- MIT
- Herramientas permitidas
- —
¿Qué hace la skill git-flow?
Use when creating a branch, using worktrees for parallel work, committing, or wrapping up. Covers branch naming, conventional commits, short-lived branches, worktree isolation, and final merge/cleanup.
Cómo instalar la skill git-flow
Cada comando copia la carpeta de la skill al directorio de skills del cliente. Reinicia el cliente o inicia una nueva sesión para cargarla.Instalar la skill git-flow en Plugin
/plugin marketplace add chipfighter/coding-discipline /plugin install coding-discipline@coding-discipline
Instalar la skill git-flow en Claude Code
~/.claude/skills/git-flow/SKILL.md
$ npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow ~/.claude/skills/git-flowInstalar la skill git-flow en Claude Code (project)
.claude/skills/git-flow/SKILL.md
$ npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow .claude/skills/git-flowInstalar la skill git-flow en Codex
~/.agents/skills/git-flow/SKILL.md
$ npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow ~/.agents/skills/git-flowInstalar la skill git-flow en Gemini CLI
~/.gemini/skills/git-flow/SKILL.md
$ npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow ~/.gemini/skills/git-flowInstalar la skill git-flow en Claude.ai
npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow git-flow && zip -r git-flow.zip git-flow # claude.ai → Customize → Skills → + → Create skill → Upload a skill → git-flow.zip
SKILL.md
Ver en GitHubBranch naming rules, protected branches, whether to merge directly or through a PR / MR, whether merging triggers CI, and how to choose versions / who creates tags are project-specific rules governed by this repository's
AGENTS.md/CLAUDE.md. This skill provides only general discipline.
Version / tag closeout (only for projects that manage versions with tags + CHANGELOG; a tag is a version bookmark—whether it also means release / deployment is defined by the project guide document)
- Choose the version before creating the branch: first confirm the intended tag with the owner—state the previous tag, what remains in the backlog, and whether this work is a feature or a fix, then recommend a version. Wait for the owner's confirmation before creating the branch; do not finish the work only to discover there is no agreed release target.
- Follow SemVer: major = breaking change, minor = backward-compatible feature, patch = backward-compatible fix. For 0.x, use the looser convention (minor = capability, patch = fix), and when uncertain prefer the larger bump. The project guide document defines what counts as a minor change.
- Freeze once decided: after the target version is confirmed, freeze its scope. New requirements arising midway go to the backlog / next version by default. Including one in the current version requires explicit owner approval and a clear statement of what it displaces or defers.
- Use a component, not a version number, as the commit scope (
feat(auth):, notfeat(v1.2):). Branches are deleted; commit history is not. The history remains accurate if the version changes. - Version closeout sequence: complete the scope → merge the branch into the baseline → get CI green → move the CHANGELOG entry from pending into the new version → create the tag (who creates it and how are project-specific).
Branches and commits
- Create a new branch for each development effort. Never edit directly on a protected main branch or someone else's branch. If the user or client has explicitly provided a working branch, keep using it instead of creating a pointless one. Keep branches short-lived: integrate them quickly rather than letting them drift.
- Use a type + short description in branch names (for example,
feat/search-paginationorfix/login-timeout); follow the project's naming convention when it has one. - Use conventional commits:
type(scope): description(feat/fix/refactor/docs/chore…). Commit in small steps, each independently reversible.
Parallel worktrees (when running several workstreams at once or isolating work from the current workspace)
- First check whether you are already in an isolated workspace. If so, do not nest another one.
- Prefer built-in worktree management in clients such as Claude Code / Codex. Do not manually run
git worktree addand create a workspace the client cannot see; fall back to Git only when the client lacks this capability. - Before creating a project-local worktree under
.worktrees/, confirm that the directory is gitignored; otherwise its contents may be committed accidentally. - After creating it, install dependencies and run the baseline tests. Report existing failures before starting work.
Wrap-up
- Verify that all tests pass before wrapping up (see verify-before-done). A failing branch must not proceed to merge / PR.
- Offer explicit choices instead of asking an open-ended “What next?”: ① merge into the baseline branch ② push and open a PR/MR ③ keep as-is ④ discard.
- Always in this order: merge and verify success → remove the worktree → delete the branch. A branch still referenced by a worktree cannot be deleted; before running
git worktree remove,cdback to the main repository. - Clean up only worktrees you created; do not touch client-created ones. Discarding requires typed confirmation. Do not force-push unless explicitly asked.
Archivos de esta skill
1Preguntas sobre la skill git-flow
¿Cómo instalo la skill git-flow en Claude Code?
Ejecuta npx degit chipfighter/coding-discipline/plugins/coding-discipline/skills/git-flow ~/.claude/skills/git-flow. Claude Code carga las skills desde ~/.claude/skills (todos los proyectos) o .claude/skills (un proyecto) y usa una skill cuando su descripción coincide con la tarea.
¿Qué clientes pueden usar la skill git-flow?
Cualquier cliente que lea el formato Agent Skills: Claude Code, Codex, Gemini CLI y claude.ai (subir como ZIP). Los scripts de la skill se ejecutan solo donde el cliente permite la ejecución de código.