docs(merge-protections): document auto_merge_conditions#11339
Merged
mergify[bot] merged 1 commit intomainfrom Apr 30, 2026
Conversation
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 👀 Review RequirementsWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 ReviewsWonderful, this rule succeeded.
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
There was a problem hiding this comment.
Pull request overview
This PR updates the Merge Protections documentation to introduce and recommend auto_merge_conditions (a conditional auto-merge/auto-queue mechanism) and to clarify migration from the deprecated autoqueue setting.
Changes:
- Document
auto_merge_conditionson the Auto-Merge page, including accepted/rejected values, behavior matrix, constraints, and migration guidance fromautoqueue. - Update the Merge Protections setup example to use
auto_merge_conditions. - Adjust the merge-queue rules docs deprecation callout to point readers to
auto_merge_conditionsmigration guidance.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/content/docs/merge-queue/rules.mdx | Updates the autoqueue deprecation callout to direct users to auto_merge_conditions and the migration section. |
| src/content/docs/merge-protections/setup.mdx | Updates the recommended Merge Protections configuration example and explanation to use auto_merge_conditions. |
| src/content/docs/merge-protections/auto-merge.mdx | Expands Auto-Merge docs to cover auto_merge_conditions vs auto_merge, including examples, behavior matrix, and autoqueue migration rules. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
6f6fee0 to
7e2345e
Compare
Contributor
Author
Revision history
|
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
7e2345e to
f649ef4
Compare
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
f649ef4 to
1569c35
Compare
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
1569c35 to
a0ef308
Compare
remyduthu
previously approved these changes
Apr 30, 2026
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
a0ef308 to
23d9a97
Compare
Document the new `auto_merge_conditions` field in `merge_protections_settings`,
the conditional form of auto-merge that gates the action on a list of conditions
rather than firing for every PR.
The Auto-Merge page now covers both fields side-by-side, with a behavior matrix,
the rejected values (`false`, `null`, `{}`), the mutual-exclusion rules
(`auto_merge` and `autoqueue`), and four migration patterns: bot-only,
label-gated, multi-bot OR, and schedule-restricted. The `autoqueue` deprecation
callout in the queue rules page now points at `auto_merge_conditions` and the
Setup page reflects the recommended field in its example. The migration section
also documents the auto-migration transformer's translation rules and deadline
(2026-07-16).
`auto_merge` is positioned as the boolean shorthand but not yet marked
deprecated (formal deprecation flips with MRGFY-7083).
Fixes MRGFY-7108
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Change-Id: Ife6122a6078570f5dc803256ad674b55ac90d2d8
kozlek
force-pushed
the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
from
23d9a97 to
15f9de7
Compare
remyduthu
approved these changes
Apr 30, 2026
jd
approved these changes
Apr 30, 2026
Contributor
Merge Queue Status
This pull request spent 3 minutes 1 second in the queue, including 2 minutes 34 seconds running CI. Required conditions to merge
|
51 tasks
mergify
Bot
deleted the
devs/kozlek/thomasberdy/mrgfy-7108-document-auto-merge-conditions/document-auto-merge-conditions--fe6122a6
branch
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.
Document the new
auto_merge_conditionsfield inmerge_protections_settings,the conditional form of auto-merge that gates the action on a list of conditions
rather than firing for every PR.
The Auto-Merge page now covers both fields side-by-side, with a behavior matrix,
the rejected values (
false,null,{}), the mutual-exclusion rules(
auto_mergeandautoqueue), and four migration patterns: bot-only,label-gated, multi-bot OR, and schedule-restricted. The
autoqueuedeprecationcallout in the queue rules page now points at
auto_merge_conditionsand theSetup page reflects the recommended field in its example. The migration section
also documents the auto-migration transformer's translation rules and deadline
(2026-07-16).
auto_mergeis positioned as the boolean shorthand but not yet markeddeprecated (formal deprecation flips with MRGFY-7083).
Fixes MRGFY-7108
Co-Authored-By: Claude Opus 4.7 (1M context) noreply@anthropic.com