summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mergify.yml1
1 files changed, 1 insertions, 0 deletions
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]