fix(ci): drop --squash from dependabot auto-merge so the queue enrolls it#496
Merged
Conversation
…lls it
`main` uses a merge queue, which owns the merge strategy. `gh pr merge --auto
--squash` is silently rejected ("the merge strategy for main is set by the merge
queue"), arming auto-merge but never enrolling the PR in the queue — so a PR
sits CLEAN but stuck (observed on #494: green checks, up-to-date branch, yet the
queue stayed empty until auto-merge was re-armed with no method flag).
Use `gh pr merge --auto` (no method) so the queue owns the squash and enrolls
the PR. The step already fires on `synchronize`, so with the method dropped it
now self-heals enrollment after an Update-branch instead of needing a manual
re-arm. Comment updated to explain the merge-queue contract.
Co-Authored-By: Claude Opus 4.8 <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.
Why
mainuses a merge queue, which owns the merge strategy.dependabot-auto-merge.ymlrangh pr merge --auto --squash, but passing a method on a queue repo is silently rejected ("the merge strategy for main is set by the merge queue") — it arms auto-merge but never enrolls the PR in the queue.Observed on #494: green required checks, up-to-date branch,
mergeStateStatus: CLEAN— yet the merge queue stayed empty and the PR sat stuck until auto-merge was re-armed with no method flag.Fix
gh pr merge --auto --squash→gh pr merge --auto(no method; the queue owns the squash). The step already fires onsynchronize, so with the method dropped it now self-heals enrollment after an Update-branch instead of needing a manual re-arm. Comment updated to document the merge-queue contract.🤖 Generated with Claude Code