From 6c607504de1bf902efbdd7320f06df444e9bc420 Mon Sep 17 00:00:00 2001 From: jochen Date: Mon, 19 Oct 2026 13:05:09 +0200 Subject: [PATCH] Say a moved trunk is met by the merge check, not promised to step 3 (review round 2) --- 00-META/process/07-feature-branches.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/00-META/process/07-feature-branches.md b/00-META/process/07-feature-branches.md index f554a2e0..8f883d83 100644 --- a/00-META/process/07-feature-branches.md +++ b/00-META/process/07-feature-branches.md @@ -178,7 +178,8 @@ never into the running one, unless it blocks the running one. ## Step 2 — Review (one reviewer, larger model; at most 3 rounds, about 15 minutes) 1. **The reviewed tree is the tree that was tried**: every feature branch was brought up to the current trunk - before its push and try (step 1). A trunk that moved since is merged only in step 3, with that head tried again. + before its push and try (step 1). A try and a merge check each run on the merge with the trunk as it is then, so a + trunk that moves later is met by the forge's merge check, not by another merge here. 2. **One reviewer reads every repository's local commits** together, against the context files and the decisions. **It is one agent, kept for the whole release** like the fixing agents: the lead continues it by its id for every later round, for the extra cycle after a failed check (step 3) and for its review record, so it