docs(merge-queue): documents the injection mode merge conflict with required status checks; says… - #13036
Merged
Conversation
… required status checks; says…
Contributor
Merge Protections🟢 All 5 merge protections satisfied — ready to merge. Show 5 satisfied protections🟢 👀 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. |
jd
approved these changes
Sep 28, 2026
Contributor
Merge Queue Status
This pull request spent 3 minutes 27 seconds in the queue, including 2 minutes 50 seconds running CI. Required conditions to merge
|
49 tasks
This branch was successfully 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
2 participants
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.
branch_protection_injection_mode: mergewas described only as "injected asmerge conditions, checked after the queue has tested the pull request", which
reads as a free choice. It is not: the queue runs those checks on the batch pull
request and then merges the original one, and a ruleset requiring those checks is
enforced by GitHub against the original head, which never carried them. GitHub
refuses the merge and the queue reports an incompatibility.
The new section sits with the other known incompatibilities and states the two
shapes that avoid it — a queue where the batch pull request is itself what lands
(
fast-forwardormerge-batch), and in-place checks, which run on the originalpull request — plus the two resolutions. Adding Mergify as a bypass actor, which
the page already recommends for every ruleset, clears it whichever bypass mode
you pick, so most readers will never meet this; the ones who do had no way to
find out why their merges were being refused.
Evidence: the queue's ruleset compatibility checks raise this conflict for a
required_status_checksrule when the injection mode ismerge, the batchbranch is not the merge target, checks do not run in place, and Mergify holds no
bypass on the ruleset.
…truncated; the rest is in the run log.
Open question: whether this belongs as a bullet at all, rather than a line under
the preferred resolution. I left it in place because it is a legitimate choice for
a queue that never needed batching, and the cost is now stated where it is offered.