From 127202fc2f8d71b3ec7127113d3292c79503116a Mon Sep 17 00:00:00 2001 From: Bastien Chanot Date: Mon, 6 Jul 2026 16:54:22 +0200 Subject: [PATCH] =?UTF-8?q?job3:=20B4+B5=20gitflow=20=E2=80=94=20chore/*?= =?UTF-8?q?=20in=20branch=20model=20+=20finish=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skills/gitflow/SKILL.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 |