From 50bfcd5cde5870661a09c21e70c393528e97519f Mon Sep 17 00:00:00 2001 From: Mattias Axelsson Date: Thu, 4 Apr 2024 16:27:43 +0200 Subject: [PATCH] Update cherry-picker.yml --- .github/workflows/cherry-picker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cherry-picker.yml b/.github/workflows/cherry-picker.yml index 8d1b855..d9285f5 100644 --- a/.github/workflows/cherry-picker.yml +++ b/.github/workflows/cherry-picker.yml @@ -24,8 +24,9 @@ jobs: commit_hash="$(git rev-parse refs/remotes/other/HEAD)" title_prefix= if ! git cherry-pick $commit_hash; then - title_prefix="CHERRY-PICK CONFLICT " - git cherry-pick $commit_hash --strategy-option theirs + git cherry-pick --abort + title_prefix="CHERRY-PICK CONFLICT " + git cherry-pick $commit_hash --strategy-option theirs fi remote_pr_id=$(gawk 'match($0, /\(#([0-9]+)\)$/, ary) {print ary[1]}' <<< $(git show -s --format=%s))