Repository navigation
Revert accidental staging→main merge (86adb303) - #992
Closed
harrymove-ctrl wants to merge 1 commit into
Closed
harrymove-ctrl wants to merge 1 commit into
harrymove-ctrl wants to merge 1 commit into
Conversation
This reverts commit 86adb30 (-m 1). That merge was created by mistake via the GitHub merges API while checking conflicts for #988; it was not an intentional promote. Restores main to the pre-merge tip (first parent 0ffbacb / #916). Staging tip 8fa42bc (#990) is unchanged — re-promote via a proper PR when ready.
Collaborator
Author
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
86adb303(“dry-run”) mergedstaging(8fa42bc) intomainby mistake via the GitHub merges API while checking conflicts for #988. It was not an intentional promote.What
git revert -m 1 86adb303— restoresmainto the pre-merge tip (first parent0ffbacbb/ #916).8fa42bc(Promote dev → staging #990) is unchanged.Test plan
/healthcommit returns to0ffbacbb(or prior prod tip), not86adb3038fa42bc