From a26e2dd2d2b67552dbaa619091e7f15ad8deb08b Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Wed, 27 Mar 2019 14:23:24 +0100
Subject: [PATCH 1/3] Mergify it!

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

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..4953b27a
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,28 @@
+
+pull_request_rules:
+  - name: Merge PRs that are ready
+    conditions:
+      - status-success=Travis CI - Pull Request
+      - status-success=typesafe-cla-validator
+      - "#approved-reviews-by>=1"
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
+      - label!=status:block-merge
+    actions:
+      merge:
+        method: squash
+        strict: smart
+
+  - name: Delete the PR branch after merge
+    conditions:
+      - merged
+    actions:
+      delete_head_branch: {}
+
+  - name: auto add wip
+    conditions:
+      # match a few flavours of wip
+      - title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
+    actions:
+      label:
+        add: ["status:block-merge"]
\ No newline at end of file

From 66ea51c7cd8afcece50749ff4acc8350b9ce583e Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Wed, 27 Mar 2019 14:35:40 +0100
Subject: [PATCH 2/3] auto-merge for scala-steward

---
 .mergify.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 4953b27a..4fc68b55 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -13,6 +13,16 @@ pull_request_rules:
         method: squash
         strict: smart
 
+  - name: Merge scala-steward's PRs
+    conditions:
+      - author=scala-steward
+      - status-success=Travis CI - Pull Request
+      - label!=status:block-merge
+    actions:
+      merge:
+        method: squash
+        strict: smart
+
   - name: Delete the PR branch after merge
     conditions:
       - merged
@@ -25,4 +35,4 @@ pull_request_rules:
       - title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
     actions:
       label:
-        add: ["status:block-merge"]
\ No newline at end of file
+        add: ["status:block-merge"]

From d3a47a471e24652ace4d3070bc10f7d656764847 Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Wed, 27 Mar 2019 16:11:46 +0100
Subject: [PATCH 3/3] revert scala-steward auto-merge

---
 .mergify.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 4fc68b55..b90435a2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -12,17 +12,7 @@ pull_request_rules:
       merge:
         method: squash
         strict: smart
-
-  - name: Merge scala-steward's PRs
-    conditions:
-      - author=scala-steward
-      - status-success=Travis CI - Pull Request
-      - label!=status:block-merge
-    actions:
-      merge:
-        method: squash
-        strict: smart
-
+        
   - name: Delete the PR branch after merge
     conditions:
       - merged
@@ -35,4 +25,4 @@ pull_request_rules:
       - title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
     actions:
       label:
-        add: ["status:block-merge"]
+        add: ["status:block-merge"]
\ No newline at end of file