From 59746d7397283255adca36f34f3fa0887c7d0da9 Mon Sep 17 00:00:00 2001
From: Martin Kojtal <martin.kojtal@arm.com>
Date: Fri, 7 Feb 2020 15:05:33 +0000
Subject: [PATCH] mergify: CI only if PR is without conflicts

Conflict -> needs: work
---
 .mergify.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index d3d0fa68644..b1e0e77da6f 100644
--- 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)