diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-15 00:41:58 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-15 00:41:58 +0300 |
| commit | 591d5d25916c2bfefd311a032e8b24536c6f4071 (patch) | |
| tree | a1fb1811360fa7649129584578f2aa54ec9672e3 | |
| parent | 9b6a166382bdce525c1dcfb077c7a152267ee69e (diff) | |
| download | mergify-591d5d25916c2bfefd311a032e8b24536c6f4071.tar.gz mergify-591d5d25916c2bfefd311a032e8b24536c6f4071.zip | |
T8782: Add required `if:` clause to backport-conflict merge_protection
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.
| -rw-r--r-- | .mergify.yml | 2 |
1 files changed, 2 insertions, 0 deletions
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 |