From 0919a112ff39fbc29d7edac50e55bc238a374250 Mon Sep 17 00:00:00 2001
From: Aarav Gupta <aarav@spikonado.com>
Date: Mon, 27 Apr 2026 21:36:38 +0530
Subject: [PATCH 1/2] ci: Create mergify.yml for pull request management

---
 .github/mergify.yml | 54 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..2ff76310
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,54 @@
+pull_request_rules:
+  - name: Backport to humble at the reviewer's discretion
+    conditions:
+      - base=master
+      - "label=backport-humble"
+    actions:
+      backport:
+        branches:
+          - humble
+
+  - name: Backport to jazzy at the reviewer's discretion
+    conditions:
+      - base=master
+      - "label=backport-jazzy"
+    actions:
+      backport:
+        branches:
+          - jazzy
+
+  - name: Backport to kilted at the reviewer's discretion
+    conditions:
+      - base=master
+      - "label=backport-kilted"
+    actions:
+      backport:
+        branches:
+          - kilted
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - 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 @Amronos @Narukara?
+
+  - name: Development targets rolling branch
+    conditions:
+      - base!=rolling
+      - author!=mergify[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `rolling` development branch.
+            Once merged into `rolling`, it is possible to backport to `{{base}}`, but it must be in `rolling`
+            to have these changes reflected in new distributions.

From 1fd45b6f53afe0d483282467dbd28ce5068fda68 Mon Sep 17 00:00:00 2001
From: Aarav Gupta <aarav@spikonado.com>
Date: Tue, 28 Apr 2026 16:48:15 +0530
Subject: [PATCH 2/2] Change backport base branch from master to rolling

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 2ff76310..47f48fc2 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,7 +1,7 @@
 pull_request_rules:
   - name: Backport to humble at the reviewer's discretion
     conditions:
-      - base=master
+      - base=rolling
       - "label=backport-humble"
     actions:
       backport:
@@ -10,7 +10,7 @@ pull_request_rules:
 
   - name: Backport to jazzy at the reviewer's discretion
     conditions:
-      - base=master
+      - base=rolling
       - "label=backport-jazzy"
     actions:
       backport:
@@ -19,7 +19,7 @@ pull_request_rules:
 
   - name: Backport to kilted at the reviewer's discretion
     conditions:
-      - base=master
+      - base=rolling
       - "label=backport-kilted"
     actions:
       backport: