From 4eaa8b519cd3ecbbbea6d14888fbc64416f5d21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:04:12 +0100
Subject: [PATCH 1/2] Add sai (#1416)

(cherry picked from commit 330b9e4e4ea18b423ff1cc0f8c8f7f0724ee33f4)

# Conflicts:
#	.github/mergify.yml
---
 .github/mergify.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index c51d498906..0023355e3d 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -7,3 +7,30 @@ pull_request_rules:
     actions:
         comment:
           message: This pull request is in conflict. Could you fix it @{{author}}?
+<<<<<<< HEAD
+=======
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=destogl
+      - author!=christophfroehlich
+      - author!=saikishor
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
+            to have these changes reflected into new distributions.
+>>>>>>> 330b9e4 (Add sai (#1416))

From 628c5d0683de0ee4c3ec729db9167827b26b2f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:08:02 +0100
Subject: [PATCH 2/2] Update mergify.yml

---
 .github/mergify.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 0023355e3d..917c57f427 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -7,8 +7,6 @@ pull_request_rules:
     actions:
         comment:
           message: This pull request is in conflict. Could you fix it @{{author}}?
-<<<<<<< HEAD
-=======
 
   - name: Ask to resolve conflict for backports
     conditions:
@@ -33,4 +31,3 @@ pull_request_rules:
             @{{author}}, all pull requests must be targeted towards the `master` development branch.
             Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
             to have these changes reflected into new distributions.
->>>>>>> 330b9e4 (Add sai (#1416))