Skip to content

docs(agent): the github merge queue migration path ignored the ruleset conflict - #12748

Merged
mergify[bot] merged 1 commit into
Mergifyio:mainfrom
mergify-ci-bot:docs-agent/health-audit-integrations-and-migrations-2--github-merge-queue-migration-mutual-exclusivity
Sep 9, 2026
Merged

docs(agent): the github merge queue migration path ignored the ruleset conflict#12748
mergify[bot] merged 1 commit into
Mergifyio:mainfrom
mergify-ci-bot:docs-agent/health-audit-integrations-and-migrations-2--github-merge-queue-migration-mutual-exclusivity

Conversation

@mergify-ci-bot

Copy link
Copy Markdown
Contributor

The incremental migration path told readers to add a queue_rules block and
"leave GitHub Merge Queue enabled", then queue a low-risk pull request with
@mergifyio queue and compare the two. Followed literally, that never gets to a
comparison. While a merge_queue ruleset rule is active on the branch and
Mergify 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 exempt bypass 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.yml and
not 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_queue ruleset rule and the
bypass check it consults, plus the compatibility page this change now points at
and matches.

Open question: the detection covers the merge_queue repository 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.

@mergify
mergify Bot deployed to Mergify Merge Protections September 9, 2026 10:33 Active
@mergify

mergify Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Merge Protections

🟢 All 6 merge protections satisfied — ready to merge.

Show 6 satisfied protections

🟢 🤖 Continuous Integration

  • all of:
    • check-success = build
    • check-success = lint
    • check-success = test
    • any of:
      • check-success = test-broken-links
      • label = ignore-broken-links
    • any of:
      • -head-repo-full-name~=^Mergifyio/
      • check-success=Cloudflare Pages

🟢 👀 Review Requirements

  • any of:
    • #approved-reviews-by >= 2
    • author = dependabot[bot]
    • author = renovate[bot]
    • all of:
      • -head ~= ^docs-agent/
      • author = mergify-ci-bot

🟢 Enforce conventional commit

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:

🟢 🔎 Reviews

  • #changes-requested-reviews-by = 0
  • #review-requested = 0
  • #review-threads-unresolved = 0

🟢 📕 PR description

  • body ~= (?ms:.{48,})

🟢 🚦 Auto-queue

When all merge protections are satisfied, this pull request will be queued automatically.

@mergify
mergify Bot requested a review from a team September 9, 2026 10:36
@mergify
mergify Bot requested a review from a team September 9, 2026 11:38
@mergify

mergify Bot commented Sep 9, 2026

Copy link
Copy Markdown
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

@mergify mergify Bot added the queued label Sep 9, 2026
@mergify
mergify Bot merged commit 9233c1d into Mergifyio:main Sep 9, 2026
9 checks passed
@mergify mergify Bot removed the queued label Sep 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants