summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Magyar2020-03-06 12:04:30 -0800
committerAlbert Magyar2020-03-06 12:04:30 -0800
commitfa67a6fe13105131227956df5abb1410b7e231b8 (patch)
treee7804baace71024b0f962b94328906b3009c03bb
parent22f9c43cfd617407f687eb35154ea18f16626f5b (diff)
Make mergify open backport PRs & signal on failed cherry-picks
-rw-r--r--.mergify.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mergify.yml b/.mergify.yml
index 2167f6f3..0428d8cb 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -34,6 +34,7 @@ pull_request_rules:
backport:
branches:
- 3.2.x
+ ignore_conflicts: True
label:
add: [Backported]