We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
conflict_resolution
1 parent 4614b58 commit 5cbcb0fCopy full SHA for 5cbcb0f
.github/workflows/backbot.yml
@@ -49,7 +49,6 @@ jobs:
49
github_token: ${{ steps.backbot-token.outputs.token }}
50
copy_labels_pattern: '^(?!cla\/signed$).*' # copy all labels other than the cla/signed label
51
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
53
merge_commits: skip # skip merge commits found in the original PR history
54
pull_description: |-
55
Backport of #${pull_number} to `${target_branch}`, triggered by a label.
0 commit comments