From 7bec5594644176788bb09f992eabdfd98e6e755a Mon Sep 17 00:00:00 2001
From: Aaron Marburg <amarburg@uw.edu>
Date: Wed, 30 Aug 2023 10:01:59 -0700
Subject: [PATCH] Per @evan-palmer, trying out mergify to maintain ROS2
 branches

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 0000000..9600cee
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,26 @@
+pull_request_rules:
+  - name: backport to iron at reviewers discretion
+    conditions:
+      - base=main
+      - "label=backport-iron"
+    actions:
+      backport:
+        branches:
+          - iron
+
+  - 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: development targets main branch
+    conditions:
+      - base!=main
+      - author!=mergify[bot]
+    actions:
+        comment:
+          message: |
+            Please target the `main` branch for development, we will backport the changes to {{base}} for you if approved and if they don't break API.