chore: reconcile main release ancestry into dev - #429
Merged
Merged
Conversation
…reporter chore(ci): promote review candidate reporter to main
…permission fix(ci): promote reporter comment permission to main
…ignore-skipped fix(ci): promote skipped-run filter to main
…eporter chore(ci): promote HR Candidate reporter wording
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
Reconcile
mainancestry back intodevbefore the release merge.maincontains four earlier CI-promotion merge commits that are not ancestors ofdev, but their content is already present. The computed merge tree is byte-for-byte identical to the current preflighteddevtree, so this changes topology only.Verification
git merge-tree --write-tree origin/dev origin/mainequalsorigin/dev^{tree}.