chore(sync): carry main back into beta - #470
Merged
Merged
Conversation
Release: merge beta 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.
mainheld 1 commit(s)betadid not — release version bumps committed onto the branch the release ran from, and anything else that arrived out of band. Left unreconciled, both branches change the version file independently and the nextbeta→mainpromotion conflicts on it.0 file(s) change. A 0-file result is the normal and correct outcome once the content has already reached
betaby other means — recording the ancestry is the payload. Without it the merge base never moves and the next promotion conflicts exactly as before.Version files were resolved to
beta's side, whose line is ahead of the released one, so this never moves a version backwards. Any conflict outside them aborts the merge for a human instead.Opened by fleet-back-merge.yml, using the algorithm
release.ymlalready applies to its ownsync/*-to-developmentpull requests.