From 591d5d25916c2bfefd311a032e8b24536c6f4071 Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Fri, 15 May 2026 00:41:58 +0300 Subject: T8782: Add required `if:` clause to backport-conflict merge_protection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mergify schema validation rejected the prior commit with `Field required @ root → merge_protections → item 0 → if`. The `if:` clause scopes when the rule applies; without it the entry is invalid. Now `if: - label = backport-conflict` so the rule applies only when the label is present, and `success_conditions: - label != backport-conflict` fails whenever the rule applies → merge blocked while the label is set. No behavior change vs. intent — purely fixing schema compliance. --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 74e9439..14d4520 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -197,5 +197,7 @@ merge_protections: Block merge while the backport-conflict label is present. The label is auto-applied by the backport action on cherry-pick conflicts and must be manually removed after the conflict is resolved in the PR. + if: + - label = backport-conflict success_conditions: - label != backport-conflict -- cgit v1.2.3