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: