From eb12f098d8bfbe7691a463358e07586b1f35348c Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Fri, 22 Nov 2024 14:47:00 +0100
Subject: [PATCH] Add commit merge conflicts to easier resolve issues

---
 .backportrc.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.backportrc.json b/.backportrc.json
index 6ea7aa8ef..4e331a809 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -4,5 +4,6 @@
   "targetBranchChoices": ["1.x"],
   "targetPRLabels": ["backport"],
   "autoMerge": true,
-  "autoMergeMethod": "merge"
+  "autoMergeMethod": "merge",
+  "commitConflicts": true
 }