diff options
| author | Albert Magyar | 2020-03-06 12:15:12 -0800 |
|---|---|---|
| committer | Albert Magyar | 2020-03-08 12:36:42 -0700 |
| commit | 746a9c93246a7b6d205bfd3290932dda1d9352da (patch) | |
| tree | cde2842186500a1bca13d0c97784b590868138eb | |
| parent | 3bee2ffb2eb6988cb2fe1274692b726525700d6b (diff) | |
Label & block conflicting backport PRs
| -rw-r--r-- | .mergify.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.mergify.yml b/.mergify.yml index 19f23e64..96c67d1c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -14,6 +14,7 @@ pull_request_rules: - base=master - label="Please Merge" - label!="DO NOT MERGE" + - label!="bp-conflict" actions: merge: method: squash @@ -30,6 +31,7 @@ pull_request_rules: branches: - 1.2.x ignore_conflicts: True + label_conflicts: "bp-conflict" label: add: [Backported] @@ -48,6 +50,7 @@ pull_request_rules: - base=1.2.x - label="Backport" - label!="DO NOT MERGE" + - label!="bp-conflict" actions: merge: method: squash |