Add commit merge conflicts to easier resolve issues

jaapio · jaapio · commit eb12f098d8bf · 2024-11-22T14:47:00.000+01:00
diff --git a/.backportrc.json b/.backportrc.json
@@ -4,5 +4,6 @@
   "targetBranchChoices": ["1.x"],
   "targetPRLabels": ["backport"],
   "autoMerge": true,
-  "autoMergeMethod": "merge"
+  "autoMergeMethod": "merge",
+  "commitConflicts": true
 }
