diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 28bb2b41..3f7d6df3 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,3 +27,4 @@ jobs: copy_requested_reviewers: true label_pattern: to-be-backported target_branches: 11.8.x + conflict_resolution: draft_commit_conflicts