docs(agent): the github merge queue migration path ignored the ruleset conflict - #12748
Merged
Conversation
Contributor
Merge Protections🟢 All 6 merge protections satisfied — ready to merge. Show 6 satisfied protections🟢 🤖 Continuous Integration
🟢 👀 Review Requirements
🟢 Enforce conventional commitMake sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 Reviews
🟢 📕 PR description
🟢 🚦 Auto-queueWhen all merge protections are satisfied, this pull request will be queued automatically. |
sileht
approved these changes
Sep 9, 2026
jd
approved these changes
Sep 9, 2026
Contributor
Merge Queue Status
This pull request spent 4 minutes 9 seconds in the queue, including 3 minutes 31 seconds running CI. Required conditions to merge
|
63 tasks
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.
The incremental migration path told readers to add a
queue_rulesblock and"leave GitHub Merge Queue enabled", then queue a low-risk pull request with
@mergifyio queueand compare the two. Followed literally, that never gets to acomparison. While a
merge_queueruleset rule is active on the branch andMergify is not a bypass actor on that ruleset, GitHub refuses every merge
Mergify performs outside its own queue, and the queue action reports a
configuration error instead of merging.
The steps now say so, and route through the configuration that does let both
stay in place at once: Mergify as a bypass actor in the
exemptbypass mode,which lets it merge directly while GitHub's queue keeps applying to everyone
else. The rollback sentence follows the same route, and notes that branch
protections are never rewritten. The minimal-configuration section gained the
same caution, since "no configuration is needed" was true of
.mergify.ymlandnot of the branch, and the FAQ answer that branch protections can all stay as
they are now names the exception and links the list. The migration index
described the page as extending GitHub Merge Queue, which the same conflict
rules out, so it now says replace.
Evidence: the queue-time detector for the
merge_queueruleset rule and thebypass check it consults, plus the compatibility page this change now points at
and matches.
Open question: the detection covers the
merge_queuerepository ruleset rule.If a repository still requires GitHub's merge queue through a classic branch
protection instead, the wording here points at a ruleset that will not be there;
the remedy (stop requiring GitHub's queue on that branch) is the same either way.