Why
The approved repair wave for #472-#475 must follow the repository rule that delivery branches start from main, while the current main and dev histories have diverged after the v1.0.36 promotion and v1.0.37-dev.1 prerelease. Starting four repair branches before restoring ancestry would make PRs to dev carry unrelated main-side history or require an explicit branch-policy exception.
Scope
Synchronize the current main history into dev through the normal PR gates before any repair branch is created. Do not change product behavior, tests, CI policy, release mechanics, or the four repair issues.
Approach
Create the delivery from the fetched origin/main snapshot, target dev, preserve any dev-only commits, and verify the resulting merge base makes origin/main an ancestor of the updated dev.
Acceptance criteria
Blocked by
None - can start immediately.
Why
The approved repair wave for #472-#475 must follow the repository rule that delivery branches start from
main, while the currentmainanddevhistories have diverged after the v1.0.36 promotion and v1.0.37-dev.1 prerelease. Starting four repair branches before restoring ancestry would make PRs todevcarry unrelated main-side history or require an explicit branch-policy exception.Scope
Synchronize the current
mainhistory intodevthrough the normal PR gates before any repair branch is created. Do not change product behavior, tests, CI policy, release mechanics, or the four repair issues.Approach
Create the delivery from the fetched
origin/mainsnapshot, targetdev, preserve any dev-only commits, and verify the resulting merge base makesorigin/mainan ancestor of the updateddev.Acceptance criteria
devand contains no product or test changes beyond the synchronization delivery metadata.specgit finish --jsonexits 0 before merge.git merge-base --is-ancestor origin/main origin/devexits 0.main.Blocked by
None - can start immediately.