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

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

diff --git a/.mergify.yml b/.mergify.yml
index 0428d8cb..fed765bd 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -19,6 +19,7 @@ pull_request_rules:
       - base=master
       - label="Please Merge"
       - label!="DO NOT MERGE"
+      - label!="bp-conflict"
     actions:
       merge:
         method: squash
@@ -35,6 +36,7 @@ pull_request_rules:
         branches:
           - 3.2.x
         ignore_conflicts: True
+        label_conflicts: "bp-conflict"
       label:
         add: [Backported]
 
@@ -59,6 +61,7 @@ pull_request_rules:
       - base=3.2.x
       - label="Backport"
       - label!="DO NOT MERGE"
+      - label!="bp-conflict"
     actions:
       merge:
         method: squash
-- 
cgit v1.2.3