chore: sync main → develop after v0.9.1#765
Merged
Merged
Conversation
release: develop → main (v0.9.1 — hosted skill-CORS hotfix)
Co-authored-by: ornn-release-bot[bot] <283908294+ornn-release-bot[bot]@users.noreply.github.com>
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.
Auto-opened + auto-merged after
v0.9.1was tagged onmain.Brings the version bump + consumed CHANGELOG entries back to
developso subsequent work starts from the right version. Only delta vsdevelopis the release-bump commit.Why merge commit (not squash)
A merge commit gives this PR two parents: the current
developtip and main's version-bump commit. That makesgit merge-base(main, develop)= main's HEAD, so the nextdevelop → mainPR diff is clean (no "version change" that's already on both sides).A squash-merge creates a brand-new commit on
developthat has no parent link to main's bump commit. The two branches then carry the same file contents but diverged histories — every subsequentdevelop → mainPR shows a phantom version bump until the histories rejoin.The workflow's auto-merge step calls the GitHub merge API directly with
merge_method: mergeto enforce this. If you're ever merging this PR manually, click Create a merge commit, never Squash and merge.