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