From e78617b6c6b3f2b513d61a2ab19b3276b0e653d4 Mon Sep 17 00:00:00 2001
From: Chris Thielen <cthielen@netflix.com>
Date: Fri, 2 Jan 2026 18:41:58 -1000
Subject: [PATCH] chore: update mergify.yml

---
 .mergify.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b8c1225d..5ad1aae4 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,27 @@
+queue_rules:
+  - name: default
+    merge_method: squash
+
+  - name: rebase
+    merge_method: rebase
+
 pull_request_rules:
   - name: Auto Squash and Merge
     conditions:
       - base=master
-      - status-success=ci
+      - check-success=ci
       - 'label=ready to squash and merge'
     actions:
       delete_head_branch: {}
-      merge:
-        method: squash
-        strict: smart
+      queue:
+        name: default
+
   - name: Auto Rebase and Merge
     conditions:
       - base=master
-      - status-success=ci
+      - check-success=ci
       - 'label=ready to rebase and merge'
     actions:
       delete_head_branch: {}
-      merge:
-        method: rebase
-        strict: smart
+      queue:
+        name: rebase