Repository navigation
chore: sync production history into staging - #380
Merged
Merged
Conversation
angelayzheng
approved these changes
Nov 5, 2026
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
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.
What this changes
Record the previous production merge in staging's ancestry without changing any files. This unblocks the strict up-to-date requirement on the staging → main promotion in #379.
Why
Current main is
9405d94e1916f322712bc8a34f93c2c4ecb45022from #373. Its release content is already in staging, but that merge commit is not an ancestor of staging. The automatic history-sync workflow has not been activated on main yet, so this is the initial reviewed reconciliation.Verification
880e52f39aaba6cf54c6d1898fc027005faecc76.9405d94e1916f322712bc8a34f93c2c4ecb45022.7505dfb06b22a76c792eea03294493a36eb4292c.git merge-tree --write-tree <staging> <main>matches staging's exact tree:ab89eba944e8ea5983fcb9b716781d262f82a96e.git diff --name-only <staging> <snapshot>is empty.Merge and deployment notes
Use a merge commit, preserving the snapshot's ancestry; never squash or rebase this PR. The staging merge queue is configured to use merge commits.
No files, configuration, migrations, or member documentation change. Normal staging CI/deployment triggers still apply. After merge, fetch both branches and verify main is an ancestor of staging. Keep the release automation correction in #377 as a prerequisite to activating that workflow in production.