From 1758cc4718529c9d4c4603201b2dc4c522e6e90e Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Wed, 12 Feb 2025 11:33:15 +0100
Subject: [PATCH] Refactor mergify config

---
 .github/mergify.yml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 54c84e3..18edda0 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -5,6 +5,22 @@ defaults:
 
 queue_rules:
   - name: default
+    merge_method: merge
+    update_method: rebase
+    queue_conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success~=/ Ready To Merge$
+
+  - name: rebase
+    merge_method: rebase
+    update_method: rebase
+    queue_conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success~=/ Ready To Merge$
+
+  - name: squash
+    merge_method: squash
+    update_method: rebase
     queue_conditions:
       # Conditions to get out of the queue (= merged)
       - check-success~=/ Ready To Merge$
@@ -20,8 +36,6 @@ pull_request_rules:
       - label=status:merge-when-green
     actions:
       queue:
-        merge_method: merge
-        update_method: rebase
         name: default
 
   - name: Merge (Rebase) PRs that are ready
@@ -34,9 +48,7 @@ pull_request_rules:
       - label=status:merge-rebase-when-green
     actions:
       queue:
-        merge_method: rebase
-        update_method: rebase
-        name: default
+        name: rebase
 
   - name: Merge (Squash) PRs that are ready
     conditions:
@@ -48,9 +60,7 @@ pull_request_rules:
       - label=status:merge-squash-when-green
     actions:
       queue:
-        merge_method: squash
-        update_method: rebase
-        name: default
+        name: squash
 
   - name: Delete the PR branch and remove label after merge/close
     conditions: