diff --git a/.github/actions/composite/updateProtectedBranch/action.yml b/.github/actions/composite/updateProtectedBranch/action.yml index 61c7719b242a..e4683029639f 100644 --- a/.github/actions/composite/updateProtectedBranch/action.yml +++ b/.github/actions/composite/updateProtectedBranch/action.yml @@ -51,11 +51,14 @@ runs: with: GPG_PASSPHRASE: ${{ inputs.GPG_PASSPHRASE }} - - name: Checkout source branch + - name: Update target and source branches shell: bash run: | git fetch + git checkout ${{ env.TARGET_BRANCH }} + git merge origin/${{ env.TARGET_BRANCH }} git checkout ${{ env.SOURCE_BRANCH }} + git merge origin/${{ env.SOURCE_BRANCH }} - name: Set New Version shell: bash