diff --git a/skills/gitflow/SKILL.md b/skills/gitflow/SKILL.md index 8e73c0b..684bb24 100644 --- a/skills/gitflow/SKILL.md +++ b/skills/gitflow/SKILL.md @@ -24,9 +24,10 @@ single-target and cannot do the directed / fan-out merges below. ## Branch model -`main` (prod) · `develop` (integration, off main) · `feature/*` and `bugfix/*` -(off develop → develop) · `release/*` (off develop → main + back-merge develop) -· `hotfix/*` (off main → main + develop [+ any open release/*]). +`main` (prod) · `develop` (integration, off main) · `feature/*`, `bugfix/*` and +`chore/*` (off develop → develop; chore = memory/doc maintenance) · `release/*` +(off develop → main + back-merge develop) · `hotfix/*` (off main → main + +develop [+ any open release/*]). ## Operations — all via the lib @@ -41,7 +42,7 @@ bash ~/.claude/lib/gitflow.sh protected-base [br] # rc 0 on main/develop — the | Current branch | Merges into | then | |---|---|---| -| `feature/*` · `bugfix/*` | develop | delete | +| `feature/*` · `bugfix/*` · `chore/*` | develop | delete | | `release/*` | main + develop | delete | | `hotfix/*` | main + develop + any open `release/*` | delete |