chore(ci): manual bridge — sync main → staging (#2211 catch-up) - #2236
Merged
Conversation
staging to main
Brings the merge commit a3864ea (PR #2211 staging→main UI merge) back onto staging so the staging-as-superset-of-main invariant holds again. Why this is needed instead of auto-sync firing: - Push-to-main ran the OLD direct-push auto-sync workflow that was on main at the time (a3864ea), not the new PR-based version. - Direct push to staging is blocked by the merge_queue ruleset (GH013), so the run failed. - The new PR-based auto-sync (#2234) lives on staging but isn't on main yet — it can't fire on the push that would've triggered it. - This PR breaks the deadlock manually. Once it merges, auto-promote fast-forwards main and main picks up the new auto-sync workflow, making the system self-healing for any future #2211-style merge. Diff is empty — a3864ea is itself a staging→main merge, so its tree matches staging's tree at that point. This commit only adds the merge graph, not new file content.
HongmingWang-Rabbit
enabled auto-merge
April 28, 2026 23:31
3 tasks
HongmingWang-Rabbit
pushed a commit
that referenced
this pull request
Jun 12, 2026
…s terminal success (internal#818)' (#2236) from fix/818-sop-checklist-na-declarations-terminal-success into main
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.
Summary
Manual bridge PR to absorb
main's tip (a3864eaf) back ontostagingso the staging-as-superset-of-main invariant holds again. The diff is empty — this is purely a merge-graph alignment.Why this isn't auto-sync
The new PR-based
auto-sync-main-to-staging.yml(#2234) just merged ontostaging, butmaindoesn't have it yet. When#2211(staging→main UI merge) landed earlier today, the OLD direct-push version of auto-sync ran (because that's what was onmainat the time) and immediately failed with GH013 — staging is protected by a merge_queue ruleset that blocks all direct pushes.So we're in a one-time bootstrap: the deadlock can't self-heal until
mainhas the new workflow. This PR does manually what the new workflow would have done automatically.What unblocks after merge
stagingabsorbsa3864eaf→ main is now an ancestor of staging.auto-promote-stagingrun fast-forwardsmainto staging's tip.mainnow has the PR-based auto-sync workflow.main, which opens its own auto-sync PR — fully self-healing.Verification
git diff origin/stagingis empty (verified locally before pushing).auto-sync-main-to-staging.yml's comment block — section "If ff fails (staging has commits main doesn't)".Test plan
git merge-base --is-ancestor origin/main origin/stagingreturns trueauto-promote-stagingrun succeeds (fast-forwards main)