From ded101ec9886ff9653e3f70600fa18f8b862b8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Tue, 1 Oct 2024 11:15:16 +0100
Subject: [PATCH] ci/mergify: add merge rule for backport to 0.44

(cherry picked from commit b0ae7bcc9e87c77020a4ecfefb7f9c3e613b887e)

# Conflicts:
#	.mergify.yml
---
 .mergify.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index f65a66930a..43e2048d1b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -6,15 +6,28 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
-        
+
+  - name: backport-0.44-queue
+    speculative_checks: 3
+    batch_size: 3
+    queue_conditions:
+      - "#approved-reviews-by >= 1"
+      - base = "0.44.0"
+    merge_method: merge
 
 pull_request_rules:
+<<<<<<< HEAD
   - name: main-automatic-merge
+=======
+  - name: automatic merge to main or backport branch
+>>>>>>> b0ae7bcc9 (ci/mergify: add merge rule for backport to 0.44)
     conditions:
         - label = "merge"
         - label != "do-not-merge"
         - "#approved-reviews-by >= 1"
-        - base = main
+        - or:
+          - base = main
+          - base = "0.44.0"
     actions:
       queue:
         autosquash: true