Merge pull request #1180 from phpDocumentor/fix/backport

Add commit merge conflicts to easier resolve issues

Author: jaapio

.backportrc.json

@@ -4,5 +4,6 @@
   "targetBranchChoices": ["1.x"],
   "targetPRLabels": ["backport"],
   "autoMerge": true,
-  "autoMergeMethod": "merge"
+  "autoMergeMethod": "merge",
+  "commitConflicts": true
 }