From 7b29628bde1b79ce4a6b6ea37a2c0ffb3ca6bbf0 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 05:23:59 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

(cherry picked from commit df814cd8385be3e8a5547d48c7e4c570def371aa)

# Conflicts:
#	.mergify.yml
---
 .mergify.yml | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 28110cd80..d04294fd9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,17 @@
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>2"
-
-pull_request_rules:
-  - name: automerge to main if approved and labeled
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>2"
       - base=main
       - label=automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+    merge_conditions:
+      - "#approved-reviews-by>2"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_method: squash
+
+pull_request_rules:
   - name: backport to v2
     conditions:
       - base=main
@@ -24,3 +20,18 @@ pull_request_rules:
       backport:
         branches:
           - release/v2.x
+<<<<<<< HEAD
+=======
+  - name: backport to v3
+    conditions:
+      - base=main
+      - label=backport/3.x
+    actions:
+      backport:
+        branches:
+          - release/v3.x
+  - name: automerge to main if approved and labeled
+    conditions: []
+    actions:
+      queue:
+>>>>>>> df814cd (ci(mergify): upgrade configuration to current format)