From 7160ceaa3a2248d07f8c350d93a608df7a47939f Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Mon, 26 Oct 2020 10:31:42 +0100
Subject: [PATCH] Add configuration for Mergify

These rules for Mergify do the following:

1. dismiss review +1's when a PR is updated
   but keep any -1 reviews, so the reviewer needs to confirm the update
   addresses the comment(s)

2. merge the PR when there are 2 (or more) positive reviews, and no
   negative ones
   don't merge when the 'do-not-merge' label is added to the PR
   also require that the status checks (CI) has passed

3. in case there are merge conflicts, Mergify will leave a message
   asking for a rebase

Documentation: https://docs.mergify.io/configuration.html
Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 .github/mergify.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 0000000..2967725
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,31 @@
+---
+pull_request_rules:
+  - name: remove outdated approvals
+    conditions:
+      - base=master
+    actions:
+      dismiss_reviews:
+        approved: true
+        changes_requested: false
+  - name: automatic merge
+    conditions:
+      - label!=do-not-merge
+      - base=master
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - status-success=check
+      - status-success=test-suite
+    actions:
+      merge:
+        method: rebase
+        rebase_fallback: merge
+      dismiss_reviews: {}
+      delete_head_branch: {}
+  - name: ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: "This pull request now has conflicts with the target branch.
+        Could you please resolve conflicts and force push the corrected
+        changes? 🙏"