chore: sync the v1.1.5 promotion merge into development - #450
Merged
Merged
Conversation
chore(release): promote v1.1.5 to main
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
12 tasks
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
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.
Refs #447. Restores branch containment after the v1.1.5 release.
Why
mainaccumulates promotion merge commits thatdevelopmentnever receives — here6463ff9from the v1.1.5 promotion (#449). Left alone the two persistent branches drift by identity every release, which is what makes a promotion PR reportBEHIND. Same reconciliation as #444 and the earlierchore/sync-main-*branches.Content-neutral
This is a fast-forward:
developmentwas fully contained inmain, so the merge introduces no file changes at all (git diffagainst the pre-merge head is empty) and only advances ancestry.git merge-base --is-ancestor origin/main HEADpasses.Merge with a merge commit, not a squash — squashing would create a new SHA and leave
main's commits outsidedevelopment's ancestry, which is exactly the drift this fixes.🤖 Generated with Claude Code