Repository navigation
meta: Merge release/cli/0.48.0 back into main - #2027
Closed
sentry-junior[bot] wants to merge 3 commits into
Closed
sentry-junior[bot] wants to merge 3 commits into
sentry-junior[bot] wants to merge 3 commits into
Conversation
Craft could not merge the 0.48.0 release branch back: #1856 changed the description line next to the version line in references/init.md. This keeps main's init.md and takes the 0.48.0 version. Co-Authored-By: BYK <126780+BYK@users.noreply.github.com> #skip-changelog
Craft skipped this after the release branch failed to merge. Sets 0.49.0-dev.0 in the files listed under versioning.files, and 0.49.0 in plugin.json (stripPrerelease). generate:skill output matches. Co-Authored-By: BYK <126780+BYK@users.noreply.github.com> #skip-changelog
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
BYK
enabled auto-merge (squash)
November 5, 2026 20:36
BYK
approved these changes
Nov 5, 2026
BYK
disabled auto-merge
November 5, 2026 20:43
Contributor
Author
|
Closing as redundant. #2028 landed the same 0.48.0 merge-back on |
This branch was previously 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.
Craft published 0.48.0 but couldn't merge the release branch back into main, so it skipped the development version bump too. This PR does both by hand. Until it lands, the Release workflow can't cut the next version.
Merge this with a merge commit, not a squash. Craft picks the bump base with
git describe --tags --match 'cli@*', socli@0.48.0has to be reachable from main. After a squash, the next prepare would compute 0.47.0 → 0.48.0 again, which is what the failed release run just did.What went wrong
sentry initprint an agent setup guide #1856 merged after the release branch was cut. It changed thedescription:line inskills/sentry-cli/references/init.md, right below theversion:line that Craft bumps (versioning.files). Both git merge strategies stopped on that conflict (publish log). Craft then leftrelease/cli/0.48.0in place and skippedpostReleaseBump.Release branch "release/cli/0.48.0" already exists on remote "origin".Changes
Merge branch 'release/cli/0.48.0'is a normal merge commit. Forinit.mdit keeps main's text and takesversion: 0.48.0. Everything else merged cleanly, including the 0.48.0CHANGELOG.mdentry.meta: Bump new development versiondoes what Craft'spostReleaseBumpwould have done:0.49.0-dev.0inpackages/cli/package.json,packages/mcp-server/package.json,SKILL.mdand the 42references/*.mdfiles.0.49.0in the Claude plugin'splugin.json, because ofstripPrerelease.pnpm run generate:skillon this branch produces no further changes.After merging
Delete
release/cli/0.48.0. Craft normally deletes it, and prepare refuses to run while it exists.#skip-changelog
via @BYK.
--
View Session in Sentry