From 960e073185b15f330d5d9e1b7af2682cc7c2e8b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Fri, 8 Dec 2023 19:47:20 +0100
Subject: [PATCH] Use more mergify features (#888)

---
 .github/mergify.yml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 3aaaab2001..692c346ab4 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -8,7 +8,6 @@ pull_request_rules:
         branches:
           - humble
 
-
   - name: Backport to iron at reviewers discretion
     conditions:
       - base=master
@@ -21,7 +20,29 @@ pull_request_rules:
   - name: Ask to resolve conflict
     conditions:
       - conflict
-      - author!=mergify
+      - author!=mergify[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 @dstogl @christophfroehlich?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=dstogl
+      - author!=christophfroehlich
+      - author!=mergify[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.