Skip to content

Commit ba48e4b

Browse files
authored
[CI] Fixup backport bot (#5517)
Changes: - Backport bot should just commit merge conflicts instead of failing.
1 parent 9374643 commit ba48e4b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/command-backport.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ jobs:
4343
-->
4444
pull_title: |
4545
[${target_branch}] Backport #${pull_number}
46+
experimental: >
47+
{
48+
"conflict_resolution": "draft_commit_conflicts"
49+
}
4650
4751
- name: Label Backports
4852
if: ${{ steps.backport.outputs.created_pull_numbers != '' }}

0 commit comments

Comments
 (0)