aboutsummaryrefslogtreecommitdiff
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 f16d1871..19f23e64 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -29,6 +29,7 @@ pull_request_rules:
backport:
branches:
- 1.2.x
+ ignore_conflicts: True
label:
add: [Backported]