diff --git a/00-META/process/07-feature-branches.md b/00-META/process/07-feature-branches.md index f93b17e7..a7aaa73e 100644 --- a/00-META/process/07-feature-branches.md +++ b/00-META/process/07-feature-branches.md @@ -55,7 +55,10 @@ never into the running one, unless it blocks the running one. ## Phase 0 — Prepare (the lead, larger model) 1. **Name the feature once:** `feat/`, the same branch name in every repository it touches. The - branch is never protected. + branch is never protected. **One milestone is one branch per repository** (the operator, 2026-10-17): every + step of a milestone uses the milestone's one name and its one folder `.work//`; after a step's merge, + which removes the branch on the forge, the next step makes it again from the new `main` under the same name. + Never a second name for a step (`-2`, `-step2`). 2. **Make the worktrees:** one per touched repository under `.work//`, branched off `main` (`git worktree add .work// -b feat/ origin/main`). The lab beds find the other repositories by sibling path, so add the untouched siblings the lab reads as detached worktrees on