diff options
| author | Albert Magyar | 2020-03-08 13:20:25 -0700 |
|---|---|---|
| committer | GitHub | 2020-03-08 13:20:25 -0700 |
| commit | 0c40f2b3bf0088a226cdfcb551fc72972a030395 (patch) | |
| tree | cde2842186500a1bca13d0c97784b590868138eb | |
| parent | dd72b24dde5b28aef4a3728fdb770e26f5dbc54d (diff) | |
| parent | 746a9c93246a7b6d205bfd3290932dda1d9352da (diff) | |
Merge pull request #1429 from freechipsproject/mergify-ignore-bp-conflicts
Make mergify open backport PRs & signal on failed cherry-picks
| -rw-r--r-- | .mergify.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.mergify.yml b/.mergify.yml index f16d1871..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 @@ -29,6 +30,8 @@ pull_request_rules: backport: branches: - 1.2.x + ignore_conflicts: True + label_conflicts: "bp-conflict" label: add: [Backported] @@ -47,6 +50,7 @@ pull_request_rules: - base=1.2.x - label="Backport" - label!="DO NOT MERGE" + - label!="bp-conflict" actions: merge: method: squash |