diff options
| -rw-r--r-- | .mergify.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.mergify.yml b/.mergify.yml index 2167f6f3..fed765bd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -19,6 +19,7 @@ pull_request_rules: - base=master - label="Please Merge" - label!="DO NOT MERGE" + - label!="bp-conflict" actions: merge: method: squash @@ -34,6 +35,8 @@ pull_request_rules: backport: branches: - 3.2.x + ignore_conflicts: True + label_conflicts: "bp-conflict" label: add: [Backported] @@ -58,6 +61,7 @@ pull_request_rules: - base=3.2.x - label="Backport" - label!="DO NOT MERGE" + - label!="bp-conflict" actions: merge: method: squash |