Merge pull request #1180 from phpDocumentor/fix/backport

Add commit merge conflicts to easier resolve issues
phpDocumentor · Nov 22, 2024 · 4f6a949 · 4f6a949
2 parents b17a352 + eb12f09
commit 4f6a949
Showing 1 changed file with 2 additions and 1 deletion.
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
 }