chore: sync the v1.1.6 promotion merge into development - #456
Merged
Merged
Conversation
chore(release): promote v1.1.6 to main
This branch was successfully deployed
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.
Pull request
Summary
Refs #453. Brings the
v1.1.6promotion merge (d5a932d, PR #455) intodevelopment's ancestry so the two long-lived branches do not drift.Each release promotion lands a merge commit on
mainthatdevelopmentnever receives. Left unsynced, the next promotion pull request reportsBEHINDand surfaces a phantom textual conflict that is not real.Content is unchanged.
git diff <development-head-before> HEAD --statis empty — this is an ancestry fix only, no file differs.Verify afterwards with
git merge-base --is-ancestor origin/main origin/development.Security impact
None. No file content changes; this only records
main's promotion merge indevelopment's history.Validation
git diffbetween the previousdevelopmenthead and this branch is empty.v1.1.6artifact is unaffected; this does not alter any released commit.🤖 Generated with Claude Code