From fa67a6fe13105131227956df5abb1410b7e231b8 Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Fri, 6 Mar 2020 12:04:30 -0800
Subject: Make mergify open backport PRs & signal on failed cherry-picks

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

(limited to '.mergify.yml')

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