From db55ada2325897c41de38a1c10fad36ba08351ed Mon Sep 17 00:00:00 2001 From: hlts2 Date: Wed, 20 Sep 2023 11:34:57 +0900 Subject: [PATCH] force cherry-pick command Signed-off-by: hlts2 --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f7ea872e..50ade297 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -78,7 +78,7 @@ jobs: git checkout -b ${BACKPORT_BRANCH_NAME} # Force cherry-pick. The conflicts will be modified within the backport PR. - git cherry-pick $GITHUB_SHA + git cherry-pick $GITHUB_SHA || (git add -A && git cherry-pick --continue --no-edit) git push origin ${BACKPORT_BRANCH_NAME} gh pr create --base ${BRANCH_NAME} \