diff --git a/.github/workflows/backport-comment.yml b/.github/workflows/backport-comment.yml index 78d6fe9..16b1dea 100644 --- 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 }}"