From c2e6db20a8d807d68210ba333204bd38fc4c96ae Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Wed, 14 Oct 2026 01:02:22 -0400 Subject: [PATCH] Make the Mergify queue rebase PRs in place before merging The queue tested Renovate PRs on a draft PR and merged the originals without rebasing them (#262), because update_method only applies to in-place checks. Mergify only checks in place with max_parallel_checks: 1 and no separate merge_conditions, so move the build check into queue_conditions. Co-Authored-By: Claude Opus 5.5 --- .mergify.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index a528626..909acd4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,6 +1,13 @@ +# The queue must check pull requests in place (on the pull request itself) for +# update_method to apply; otherwise Mergify tests a draft pull request and merges +# the original un-rebased. In-place checks require max_parallel_checks: 1 and +# the CI condition in queue_conditions, with no separate merge_conditions. +merge_queue: + max_parallel_checks: 1 + queue_rules: - name: default - merge_conditions: + queue_conditions: - check-success = build # Semi-linear history: rebase the PR onto main, then merge it with a merge commit update_method: rebase