test: set conflict_resolution draft_commit_conflicts

korthout · May 10, 2024 · d8b8742 · d8b8742
1 parent 79f45a6
commit d8b8742
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/backport-comment.yml b/.github/workflows/backport-comment.yml
@@ -31,7 +31,8 @@ jobs:
           copy_requested_reviewers: true
           experimental: >
             {
-              "detect_merge_method": true
+              "detect_merge_method": true,
+              "conflict_resolution": "draft_commit_conflicts"
             }
       - name: Print was_successful output
         run: echo "${{ steps.backport.outputs.was_successful }}"