From 4658cf26a29c0f7241fe573817aa5229140e165e Mon Sep 17 00:00:00 2001 From: Florian Reimold <11774314+FlorianReimold@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:30:40 +0100 Subject: [PATCH] [GH Actions] Fixed typo in cherry-pick action --- .github/workflows/cherry-pick-to.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cherry-pick-to.yml b/.github/workflows/cherry-pick-to.yml index 81602da744..f78354489f 100644 --- a/.github/workflows/cherry-pick-to.yml +++ b/.github/workflows/cherry-pick-to.yml @@ -143,7 +143,9 @@ jobs: echo "git branch -u origin/${{ env.cherry_pick_branch }}" >> $GITHUB_OUTPUT echo "git cherry-pick ${{ github.event.before }}..${{ github.event.after }}" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT - echo "# Resolve conflicts and use git cherry-pick --contiue until all conflicts are resolved" >> $GITHUB_OUTPUT + echo "# Resolve conflicts and use" >> $GITHUB_OUTPUT + echo "# git cherry-pick --continue" >> $GITHUB_OUTPUT + echo "# until all conflicts are resolved." >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT echo "git push -f origin HEAD:${{ env.cherry_pick_branch }}" >> $GITHUB_OUTPUT echo "\`\`\`" >> $GITHUB_OUTPUT