Skip to content
Snippets Groups Projects
Unverified Commit ba48e4b8 authored by Oliver Tale-Yazdi's avatar Oliver Tale-Yazdi Committed by GitHub
Browse files

[CI] Fixup backport bot (#5517)

Changes:
- Backport bot should just commit merge conflicts instead of failing.
parent 9374643b
No related merge requests found
Pipeline #493806 waiting for manual action with stages
in 20 minutes and 59 seconds
......@@ -43,6 +43,10 @@ jobs:
-->
pull_title: |
[${target_branch}] Backport #${pull_number}
experimental: >
{
"conflict_resolution": "draft_commit_conflicts"
}
- name: Label Backports
if: ${{ steps.backport.outputs.created_pull_numbers != '' }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment