mergify: CI only if PR is without conflicts

Conflict -> needs: work
2020-02-07 15:05:33 +00:00 · 2020-02-07 15:05:33 +00:00 · 59746d7397
parent d847f9f164
commit 59746d7397
1 changed files with 3 additions and 0 deletions
--- a/.mergify.yml
+++ b/.mergify.yml
@ -74,6 +74,9 @@ pull_request_rules:
      - "#changes-requested-reviews-by=0"
      - "#approved-reviews-by>=1"

+      # No conflict with the base branch
+      - -conflict
+
      # CI green policy, at least Travis should be green
      - status-success~=continuous-integration/travis-ci/pr
      # new CI needs to be done (neutral does not work, lets check if it failed or passed, if none, we need to run again)