From fb2620b3a5425660f12d408e88bb117c225a7fcc Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 5 Mar 2020 08:44:20 -0700
Subject: [PATCH] Set ignore_conflicts, the new mergify behaviour is worse

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

diff --git a/.mergify.yml b/.mergify.yml
index 5c22e01768..e736a46a88 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -25,6 +25,7 @@ pull_request_rules:
       - label=v1.0
     actions:
       backport:
+        ignore_conflicts: true
         branches:
           - v1.0
   - name: v1.1 backport
@@ -33,6 +34,7 @@ pull_request_rules:
       - label=v1.1
     actions:
       backport:
+        ignore_conflicts: true
         branches:
           - v1.1
   - name: v1.2 backport
@@ -41,5 +43,6 @@ pull_request_rules:
       - label=v1.2
     actions:
       backport:
+        ignore_conflicts: true
         branches:
           - v1.2