From fad7df4bf239b6bebc01eb529e3f430f275781ed Mon Sep 17 00:00:00 2001
From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com>
Date: Wed, 14 Oct 2026 00:53:15 -0400
Subject: [PATCH] Auto-merge Renovate PRs through the Mergify merge queue

Renovate's own automerge (GitHub auto-merge) doesn't wait for the
build check, since main has no required checks. Instead, Mergify
queues every Renovate PR, rebases it onto main, and merges it with a
merge commit once the build check passes, for semi-linear history.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .mergify.yml  | 15 +++++++++++++++
 renovate.json |  6 ------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..a528626
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,15 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success = build
+    # Semi-linear history: rebase the PR onto main, then merge it with a merge commit
+    update_method: rebase
+    merge_method: merge
+
+pull_request_rules:
+  - name: Queue Renovate pull requests
+    conditions:
+      - author = renovate[bot]
+    actions:
+      queue:
+        name: default
diff --git a/renovate.json b/renovate.json
index 55ecf43..f45d8f1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,11 +1,5 @@
 {
   "extends": [
     "config:base"
-  ],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    }
   ]
 }