Repository navigation
fix(release): auto-merge back-merge PRs with a merge commit - #149
Merged
Merged
Conversation
The back-merge job opened the main to next PR but left the merge method to whoever clicked the button, and next allows squash for feature PRs. v0.12.0 through v0.12.4 were all squashed, so main's commits never became ancestors of next and every later back-merge re-conflicted on the same lines. Enable auto-merge with --merge so the method is pinned in code. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.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.
The
back-mergejob opens the main to next PR but left the merge method to whoever merged it. Thenextruleset allows squash (feature PRs need it for release-please), so back-merges #123, #128, #140 and #145 were all squashed. A squash leaves main's commits out of next's history, so each following back-merge re-conflicts on the same lines (this just happened merging v0.12.4 into next).release-please.yml: after creating (or finding) the back-merge PR, rungh pr merge --auto --merge, so it lands as a merge commit once required checks pass.RELEASING.md: document the auto-merge and why a manual merge must never be a squash.just promoteis unchanged: auto-merging a promotion would skip the review before a stable release.actionlint passes;
bun test116 pass.🤖 Generated with Claude Code