gitflow
Installation
SKILL.md
Gitflow
This skill covers the full gitflow branching model with two long-lived branches and short-lived branches off them.
mainis production. Merging tomaintriggers your deploy pipeline. Treat every merge tomainas a production deploy that your users will see shortly after.dev(sometimes calleddevelop) is the integration branch. Day-to-day feature and fix work lands here first.- Short-lived branches:
feat/<desc>andfix/<desc>offdev,release/<x.y.z>offdev,hotfix/<x.y.z>offmain.
Pick the flow
Read the matching reference in full and follow it step by step. Each one is self-contained.
| The user wants to... | Flow | Read |
|---|---|---|
Ship the accumulated dev work to production |
Release | references/release.md |
| Get an urgent fix into production now, can't wait for a release | Hotfix | references/hotfix.md |
| Build a new feature or a fix that will ride the next release | Feature | references/feature.md |
If the intent is ambiguous (e.g. "ship the settings fix"), ask one question: is this urgent enough to go straight to production (hotfix), or does it ride the next release (feature now, release later)?