chore: merge main release ancestry back into develop#983
Merged
Conversation
release: background-run timeline noise reduction + layout rebalance → production
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Release PR #982 is mergeable but strict branch protection correctly requires
developto contain the prior release-only merge ancestry frommain. GitHub cannot update the protecteddevelopbranch directly, so this PR performs the repository-standard normal merge oforigin/maininto the release head.No issue is needed: this is release ancestry housekeeping for #931 and #982, not a product change.
What changed
b92cd4d6.origin/main(166fd5ab) intoorigin/develop(faff3036).Out of scope
develop -> mainrelease PR.How it was verified
git diff --stat origin/develop..HEAD— empty; the resulting file tree is identical to the already-gateddevelophead.git diff --check origin/develop..HEAD— passed.git merge-base --is-ancestor origin/main HEAD— passed.developtree passed all 882 isolated test files, migration sync, production build (109 pages), required GitHub gates, Vercel dev deployment, Preview Smoke, API Contract Tests, and non-destructive dev smoke.Evidence quality: ancestry proof plus hosted gates. Re-running local full CI would test the identical file tree and add no coverage.
Risk and rollback
Risk is minimal because the file tree does not change. If needed, close this PR; no branch has been changed. After merge, revert only the merge commit if ancestry itself proves problematic—do not rewrite protected branch history.
Reviewer guide
Confirm the Files changed tab is empty and the commit has parents
faff3036and166fd5ab. The only intended outcome isorigin/mainbecoming an ancestor ofdevelopso #982 can satisfy strict branch protection.