diff options
| author | Albert Magyar | 2020-03-08 13:21:08 -0700 |
|---|---|---|
| committer | GitHub | 2020-03-08 13:21:08 -0700 |
| commit | 4c42263105b3cfa34e529d5d09f3b26cec0749b5 (patch) | |
| tree | 51b870bcf522535723b79a164e3d54e8706629e5 | |
| parent | 22f9c43cfd617407f687eb35154ea18f16626f5b (diff) | |
| parent | d0abba7a168a599fe1443d99e7f1feeeb3eb8a33 (diff) | |
Merge pull request #1372 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 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 |