From 81a7492f216fa3b59a8daefaff9137979c7ead8c Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:25:57 +0100
Subject: [PATCH 1/2] chore(mergify): move deprecated parameters from
 `pull_request_rules` to `queue_rules`

---
 .mergify/config.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.mergify/config.yml b/.mergify/config.yml
index 5398c6f322..d7985c3427 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -4,6 +4,11 @@ queue_rules:
     conditions:
       - status-success~=^jsii/superchain
       - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
 
 pull_request_rules:
   - name: label core
@@ -43,11 +48,6 @@ pull_request_rules:
         changes_requested: false
       queue:
         name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
       comment:
         message: Merging (with squash)...
     conditions:
@@ -74,11 +74,6 @@ pull_request_rules:
         changes_requested: false
       queue:
         name: default
-        method: merge
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
       comment:
         message: Merging (no-squash)...
     conditions:

From 285916b8db1293a7c2588becd370e8f68e73efea Mon Sep 17 00:00:00 2001
From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:30:06 +0100
Subject: [PATCH 2/2] Split merge and squash queues

---
 .mergify/config.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.mergify/config.yml b/.mergify/config.yml
index d7985c3427..163a8412af 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -1,6 +1,6 @@
 # See https://doc.mergify.io
 queue_rules:
-  - name: default
+  - name: default-squash
     conditions:
       - status-success~=^jsii/superchain
       - status-success=Unit Tests
@@ -10,6 +10,16 @@ queue_rules:
       {{ body }}
     merge_method: squash
 
+  - name: default-merge
+    conditions:
+      - status-success~=^jsii/superchain
+      - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: merge
+
 pull_request_rules:
   - name: label core
     actions:
@@ -47,7 +57,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
+        name: default-squash
       comment:
         message: Merging (with squash)...
     conditions:
@@ -73,7 +83,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
+        name: default-merge
       comment:
         message: Merging (no-squash)...
     conditions: