bmottin/claude_mac
1
0
Fork 0
forked from bchanot/claude
Code Pull Requests Activity

job3: B4+B5 gitflow — chore/* in branch model + finish table

Browse Source
This commit is contained in:
Bastien Chanot
2026-07-06 16:54:22 +02:00
parent 28ce7325dd
commit 127202fc2f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/gitflow/SKILL.md
+5 -4
View File
@@ -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 |