Label & block conflicting backport PRs

chipsalliance · Mar 6, 2020 · 4dbab3e · 4dbab3e
1 parent fa67a6f
commit 4dbab3e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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