From 5bbad8bb1e8453040b90195bc8a160f0523101b3 Mon Sep 17 00:00:00 2001
From: Jirka Borovec <Borda@users.noreply.github.com>
Date: Tue, 22 Mar 2022 11:06:36 +0100
Subject: [PATCH] mergify: drop ready if conflicts (#12396)

---
 .github/mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index c69253b3c8..99142a2ecb 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -50,6 +50,7 @@ pull_request_rules:
   - name: Not ready yet
     conditions:
       - or:
+        - label="has conflicts"
         - "#approved-reviews-by=0" # number of review approvals
         - "#changes-requested-reviews-by>=1" # no requested changes
     actions: