Skip to content

Commit 5cbcb0f

Browse files
committed
backbot: drop conflict_resolution option
1 parent 4614b58 commit 5cbcb0f

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

.github/workflows/backbot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
github_token: ${{ steps.backbot-token.outputs.token }}
5050
copy_labels_pattern: '^(?!cla\/signed$).*' # copy all labels other than the cla/signed label
5151
label_pattern: 'backport-to-(support\/\d+\.\d+)' # regex to match labels like backport-to-support/2.14
52-
conflict_resolution: 'draft_commit_conflicts' # create a draft PR if there are conflicts
5352
merge_commits: skip # skip merge commits found in the original PR history
5453
pull_description: |-
5554
Backport of #${pull_number} to `${target_branch}`, triggered by a label.

0 commit comments

Comments
 (0)