Update config

Flank · Aug 18, 2020 · 475ee67 · 475ee67
1 parent ee83352
commit 475ee67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,7 +1,6 @@
 pull_request_rules:
   - name: automatic merge when GitHub branch protection passes on master
     conditions:
-      - base=master
       - "#approved-reviews-by>=2"
       - status-success=Check Pull Request / check_title (pull_request)
       - status-success=Validate Gradle Wrapper / Validation (pull_request) 
@@ -14,14 +13,15 @@ pull_request_rules:
         method: squash
   - name: automatic merge when GitHub branch protection passes on master (flank-scripts)
     conditions:
-      - base=master
+      - files=
       - "#approved-reviews-by>=2"
       - status-success=Check Pull Request / check_title (pull_request)
       - status-success=Validate Gradle Wrapper / Validation (pull_request) 
       - status-success=Validate Gradle Wrapper / Validation (push)
       - status-success=macOS-workflow / build (pull_request)
       - status-success=ubuntu-workflow / build (pull_request)flank-scripts-macos-workflow
       - status-success=flank-scripts-macos-workflow
+      - files~=^(!?flank-scripts/)
     actions:
       delete_head_branch: {}
       merge: