From 5e69bac5b9aaa55cd87517661b7f628c8f2ecf52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:25:29 +0100
Subject: [PATCH] Update mergify.yml (#435)

(cherry picked from commit 36aa37235f1f5f27bd40085378e429d14a7e0aa9)

# Conflicts:
#	.github/mergify.yml
---
 .github/mergify.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 000000000..fd185e02d
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,51 @@
+pull_request_rules:
+  - name: Backport to humble at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-humble"
+    actions:
+      backport:
+        branches:
+          - humble
+
+  - name: Backport to iron at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-iron"
+    actions:
+      backport:
+        branches:
+          - iron
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - 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.