chore: sync main release history into development - #444
Merged
Merged
Conversation
release: v1.1.3
Brings the v1.1.3 promotion merge (ea1cbf8) into development's ancestry so the two persistent branches do not drift by identity. Content-neutral: the merge introduces no file changes, it only restores containment so promotion PRs stop reporting BEHIND. Refs #441 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
chore(release): promote v1.1.4 to main
|
Comment |
10 tasks
This was referenced Sep 11, 2026
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 #441. Restores branch containment after the v1.1.4 release.
Why
mainaccumulates promotion merge commits thatdevelopmentnever receives —ea1cbf8from the v1.1.3 promotion and now3af8b22from v1.1.4. Left alone, the two persistent branches drift by identity every release, which is what made #443 reportBEHIND. This is the same reconciliation as the earlierchore/sync-main-history-*andchore/sync-main-ancestry-*branches.Content-neutral
The merges introduce no file changes —
git diffbetween the pre-merge head and each merge commit is empty. They only restore ancestry, somainbecomes an ancestor ofdevelopmentagain (git merge-base --is-ancestor origin/main HEADnow passes).Merge this 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