Conversation
Version bumps land on develop via the release PR and reach main only through the manual develop -> main promotion. BASE_BRANCH env (default develop) controls the PR base.
Reconcile the repository with npm: 0.2.35 was published by a release run whose version-bump push to protected main was rejected, leaving the bump and tag unrecorded.
release: v0.2.35
ci(publish): target release PR at develop, never main
Brings back the macOS spawn-helper fix and main-only patches. Conflict resolutions (all release-flow): - publish.yml: keep develop's release-branch + PR-into-develop flow; main carried a revert back to direct 'git push origin main', which branch protection rejects (that revert is what broke the last publish run) - open-release-pr.mjs: keep (deleted by the revert on main) - package.json: keep 0.2.35 — matches the version actually on npm
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.
No description provided.