From 0207a6307c1c3187f8fc1a7ee124fbddc77335a5 Mon Sep 17 00:00:00 2001 From: Philipp Ossler Date: Thu, 26 Sep 2024 06:06:31 +0200 Subject: [PATCH] ci: Configure backport to always draft a PR --- .github/workflows/backport.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 1038dc2a9..44aadb212 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -51,3 +51,10 @@ jobs: relates to ${issue_refs} original author: @${pull_author} + + # Optional + # Specifies how the action will handle a conflict occurring during the cherry-pick. + # In all cases, the action will stop the cherry-pick at the first conflict encountered. + # When set to draft_commit_conflicts the backport will always create a draft pull request + # with the first conflict encountered committed. + conflict_resolution: draft_commit_conflicts