Skip to content

docs(merge-queue): clarify stacks override scope/file similarity in batching#11702

Merged
mergify[bot] merged 1 commit into
mainfrom
devs/sileht/mrgfy-7466-clarify-stack-precedence/clarify-stacks-override-scope-file-similarity--8a0172f8
Jun 2, 2026
Merged

docs(merge-queue): clarify stacks override scope/file similarity in batching#11702
mergify[bot] merged 1 commit into
mainfrom
devs/sileht/mrgfy-7466-clarify-stack-precedence/clarify-stacks-override-scope-file-similarity--8a0172f8

Conversation

@sileht
Copy link
Copy Markdown
Member

@sileht sileht commented Jun 2, 2026

The batch-grouping section listed priority, scopes, changed directories,
and queue time as the similarity ranking, then described stacks in a
separate paragraph that read as a fifth tier of that order. Readers
(jd on PR #11693) took it as "scope -> files -> stack" and expected
stack to come before files.

Reframe the stack rule to match the engine: in serial mode stack
co-location is a separate constraint outside the similarity ranking
(_add_pull_with_predecessors), not a ranking tier. Selected pull
requests drag their queued predecessors into the same batch regardless
of scope or directory overlap, so stack relationships take precedence
over scope and directory similarity, bounded only by batch_size.

Also repoint the stale parallel-scopes link to queue-modes#parallel-mode.

Fixes MRGFY-7466

Copilot AI review requested due to automatic review settings June 2, 2026 08:11
@mergify mergify Bot had a problem deploying to Mergify Merge Protections June 2, 2026 08:11 Failure
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 2, 2026

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟢 🤖 Continuous Integration

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

🟢 👀 Review Requirements

Wonderful, this rule succeeded.
  • any of:
    • #approved-reviews-by >= 2
    • author = dependabot[bot]
    • author = mergify-ci-bot

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

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

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

🟢 🔎 Reviews

Wonderful, this rule succeeded.
  • #changes-requested-reviews-by = 0
  • #review-requested = 0
  • #review-threads-unresolved = 0

🟢 📕 PR description

Wonderful, this rule succeeded.
  • body ~= (?ms:.{48,})

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR clarifies how merge-queue batching works in serial mode by explicitly separating the similarity ranking (priority/scopes/directories/queue time) from the stack-co-location constraint, so readers don’t misinterpret stacks as an additional “fifth tier” that comes after file similarity.

Changes:

  • Updates the parallel-mode reference to point to Queue Modes → Parallel Mode instead of the stale /merge-queue/parallel-scopes link.
  • Adds explicit wording that the similarity ranking applies only to independent PRs, and that stack dependencies are handled by a separate rule that overrides similarity.
  • Rewrites the “Stacks stay together” section to state that predecessors are pulled into the same batch regardless of scope/directory overlap, bounded by batch_size.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@mergify mergify Bot requested a review from a team June 2, 2026 08:13
Comment thread src/content/docs/merge-queue/batches.mdx Outdated
@mergify mergify Bot requested a review from a team June 2, 2026 08:15
…atching

The batch-grouping section listed priority, scopes, changed directories,
and queue time as the similarity ranking, then described stacks in a
separate paragraph that read as a fifth tier of that order. Readers
(jd on PR #11693) took it as "scope -> files -> stack" and expected
stack to come before files.

Reframe the stack rule to match the engine: in serial mode stack
co-location is a separate constraint outside the similarity ranking
(_add_pull_with_predecessors), not a ranking tier. Selected pull
requests drag their queued predecessors into the same batch regardless
of scope or directory overlap, so stack relationships take precedence
over scope and directory similarity, bounded only by batch_size.

Also repoint the stale parallel-scopes link to queue-modes#parallel-mode.

Fixes MRGFY-7466

Change-Id: I8a0172f86b0629e0086e51c038e0244339086447
@sileht sileht force-pushed the devs/sileht/mrgfy-7466-clarify-stack-precedence/clarify-stacks-override-scope-file-similarity--8a0172f8 branch from f765079 to ec8ee0c Compare June 2, 2026 08:23
@sileht
Copy link
Copy Markdown
Member Author

sileht commented Jun 2, 2026

Revision history

# Type Changes Reason Date
1 initial f765079 2026-06-02 08:23 UTC
2 content f765079 → ec8ee0c (raw) 2026-06-02 08:23 UTC

@mergify mergify Bot deployed to Mergify Merge Protections June 2, 2026 08:23 Active
@sileht sileht marked this pull request as ready for review June 2, 2026 08:25
@mergify mergify Bot requested a review from a team June 2, 2026 09:07
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 2, 2026

Merge Queue Status

This pull request spent 2 minutes 17 seconds in the queue, including 1 minute 50 seconds running CI.

Required conditions to merge

mergify Bot added a commit that referenced this pull request Jun 2, 2026
@mergify mergify Bot added the queued label Jun 2, 2026
@mergify mergify Bot merged commit f7e8781 into main Jun 2, 2026
8 of 13 checks passed
@mergify mergify Bot deleted the devs/sileht/mrgfy-7466-clarify-stack-precedence/clarify-stacks-override-scope-file-similarity--8a0172f8 branch June 2, 2026 09:23
@mergify mergify Bot removed the queued label Jun 2, 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.

4 participants