From 3bee2ffb2eb6988cb2fe1274692b726525700d6b Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Fri, 6 Mar 2020 11:47:53 -0800
Subject: Make mergify open backport PRs & signal on failed cherry-picks

---
 .mergify.yml | 1 +
 1 file changed, 1 insertion(+)

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]
 
-- 
cgit v1.2.3


From 746a9c93246a7b6d205bfd3290932dda1d9352da Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Fri, 6 Mar 2020 12:15:12 -0800
Subject: Label & block conflicting backport PRs

---
 .mergify.yml | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3