Say a moved trunk is met by the merge check, not promised to step 3 (review round 2)

2026-10-19 13:05:09 +02:00
parent 20c857443c
commit 6c607504de
1 changed files with 2 additions and 1 deletions
@@ -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