diff --git a/.github/workflows/backbot.yml b/.github/workflows/backbot.yml index e46438ac2..62f6677b1 100644 --- a/.github/workflows/backbot.yml +++ b/.github/workflows/backbot.yml @@ -49,7 +49,6 @@ jobs: github_token: ${{ steps.backbot-token.outputs.token }} copy_labels_pattern: '^(?!cla\/signed$).*' # copy all labels other than the cla/signed label label_pattern: 'backport-to-(support\/\d+\.\d+)' # regex to match labels like backport-to-support/2.14 - conflict_resolution: 'draft_commit_conflicts' # create a draft PR if there are conflicts merge_commits: skip # skip merge commits found in the original PR history pull_description: |- Backport of #${pull_number} to `${target_branch}`, triggered by a label.