force cherry-pick command (#101)

Signed-off-by: hlts2 <[email protected]>
vdaas · Sep 20, 2023 · dabf4fe · dabf4fe
1 parent 73b9cd8
commit dabf4fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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} \