upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-02-03 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

backbot: drop conflict_resolution option

Browse source
This commit is contained in:
Yonas Habteab 2026-01-21 14:03:34 +01:00
parent 4614b58092
commit 5cbcb0ff7b
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/backbot.yml vendored
View file

@ -49,7 +49,6 @@ jobs:
github_token: ${{ steps.backbot-token.outputs.token }} github_token: ${{ steps.backbot-token.outputs.token }}
copy_labels_pattern: '^(?!cla\/signed$).*' # copy all labels other than the cla/signed label 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 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 merge_commits: skip # skip merge commits found in the original PR history
pull_description: |- pull_description: |-
Backport of #${pull_number} to `${target_branch}`, triggered by a label. Backport of #${pull_number} to `${target_branch}`, triggered by a label.