Update cherry-picker.yml

AxisCommunications · Apr 4, 2024 · 50bfcd5 · 50bfcd5
1 parent 57c6114
commit 50bfcd5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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))