From 95e27ece8e15529f15b36c24d46ff7c5d26bd43f Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 3 Nov 2022 12:25:12 +1100
Subject: [PATCH] .github: Add mergify configuration (#3026)

---
 .github/mergify.yml              | 28 ++++++++++++++++++++++++++++
 .github/pull_request_template.md |  3 +++
 2 files changed, 31 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..107cb9d1
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,28 @@
+defaults:
+  actions:
+    queue:
+      method: squash
+      commit_message_template: |
+        {{ title }} (#{{ number }})
+        
+        {{ body | get_section("## Commit Message body", "") }}   
+
+pull_request_rules:
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - -draft # Draft PRs are allowed to have conflicts.
+    actions:
+      comment:
+        message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
+
+  - name: Add to merge queue
+    conditions:
+      # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
+      - label=send-it
+    actions:
+      queue:
+
+queue_rules:
+  - name: default
+    conditions: []
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7c28e9f6..900c4d5c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,3 +19,6 @@
 - [ ] I have made corresponding changes to the documentation
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] A changelog entry has been made in the appropriate crates
+
+<!-- The below text will appear as the commit message body once we squash-merge the PR. -->
+## Commit message body