Git Workflow
Overview
Two leaves cover version control. One owns the branching policy: trunk-based versus release branches, protection on main, merge queues and CODEOWNERS. The other owns the history itself: atomic commits, message conventions, rebase versus merge, repair and the changelog. Policy first, then the commits that flow through it.
When to use
- Picking a branching model; setting protection, a merge queue or CODEOWNERS.
- Commit subjects and bodies, Conventional Commits types, splitting with
git add -p. - Rebase versus merge, cleaning local history, reverting on shared branches.
- Bisecting history for a breaking commit; generating the changelog.
When not to use
- Sizing, describing or reviewing a pull request — outside this skill.
- Finding why the code broke; that hunt is a debugging task — outside this skill.
- Pipeline jobs, caches and required checks — outside this skill.
Precedence
The deepest loaded instruction governs its uniquely-claimed scope; every
scope:string is claimed by exactly one file in this tree; no leaf may widen a prohibition declared by an ancestor — leaves narrow, never override upward.
Subskill index
| Leaf | Task | Trigger |
|---|---|---|
subskills/git-workflow.md |
Branching model and protections | "which branching model" |
subskills/commits-history.md |
Commits, history, changelog | "write a commit message" |
See also
subskills/git-workflow.md— the policy.subskills/commits-history.md— the history it produces.