From c1dd15ae59fd4e30bc842b0edef7d6e14c07e02a Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Thu, 11 Apr 2024 17:24:35 +0200
Subject: [PATCH] ci: do not add the `ok-to-test` label if there is a conflict

When there is a conflict in merging a PR, the `ok-to-test` label should
not be added automatically. This prevents a loop in triggering CI jobs
for PRs that might not even build.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
---
 .mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mergify.yml b/.mergify.yml
index 0551bcc2e..882171e9b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -95,6 +95,7 @@ pull_request_rules:
   - name: start CI jobs for PRs in the merge queue
     conditions:
       - base~=^(devel)|(release-.+)$
+      - label!=conflicts
       - not:
           check-pending~=^ci/centos
       - not: