From ed9890cc9b3f61f606eb424805627829e23af3e2 Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Tue, 25 Aug 2026 13:21:34 -0400 Subject: [PATCH] fix(ci): batch mergify queue to avoid in-place review dismissal --- .mergify.yml | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index b279927..ba842a7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -20,6 +20,8 @@ merge_protections: queue_rules: - name: default + batch_size: 3 + batch_max_wait_time: 30 seconds queue_conditions: - base = main - -draft diff --git a/README.md b/README.md index 6516cbc..5530f3d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The two sanctioned deploy paths are merge to `main` triggering the pipeline and ### Merge queue -Consumer repos extend `.mergify.yml` via `extends: .github`. Mergify still auto-queues when it is awake. To kick a stuck PR, apply the `queue ready` label. That does not bypass `ci / ci` or `APPROVED`. Do not use `queued`; Mergify applies that while a PR is in the queue. +Consumer repos extend `.mergify.yml` via `extends: .github`. Mergify auto-queues when it is awake. The default queue tests up to three PRs together on a draft branch so it does not push onto the original PR. Each PR still squash-merges on its own. To kick a stuck PR, apply the `queue ready` label. That does not bypass `ci / ci` or `APPROVED`. Do not use `queued`; Mergify applies that while a PR is in the queue. ## What's in here