diff options
| -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 |