aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Magyar2020-03-06 11:47:53 -0800
committerAlbert Magyar2020-03-08 12:36:42 -0700
commit3bee2ffb2eb6988cb2fe1274692b726525700d6b (patch)
treeebd8f91823b262ed101114c9f5192b7d7663c376
parentdd72b24dde5b28aef4a3728fdb770e26f5dbc54d (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 f16d1871..19f23e64 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -29,6 +29,7 @@ pull_request_rules:
backport:
branches:
- 1.2.x
+ ignore_conflicts: True
label:
add: [Backported]