From 4bb5018146279e1a72473721a01ff5c2d04b9d47 Mon Sep 17 00:00:00 2001
From: x64Eddie <eherreraga@miners.utep.edu>
Date: Mon, 5 Oct 2020 01:44:41 -0600
Subject: [PATCH] Revert "removed the hotfix condition"

This reverts commit 9ff832fb0e58a40d7db6641961e452d36d500afc.
---
 .github/mergify.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 0779eac6..70d1ac41 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -13,4 +13,18 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - dev
\ No newline at end of file
+          - dev
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=2"
+      - "-head~=^hotfix"
+    actions:
+      merge:
+        method: squash
+  - name: Wrong branch
+    conditions:
+      - "-head~=^hotfix"
+      - "base=stable"
+    actions:
+      close:
+        message: "Thank you for your contribution @{{author}}🎉! However, please double check if this PR goes into dev and not stable 🤔. The PR is going to be closed, please make another PR for dev!"