diff --git a/.github/actions/update-built-files/action.yml b/.github/actions/update-built-files/action.yml index 1778fc7d6..24129a882 100644 --- a/.github/actions/update-built-files/action.yml +++ b/.github/actions/update-built-files/action.yml @@ -19,7 +19,8 @@ runs: shell: bash if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', inputs.baseline-branch) }} run: | - git pull + git fetch origin $(git rev-parse --abbrev-ref HEAD) + git merge --ff-only cp pnpm-lock.yaml pnpm-lock-committed.yaml git add pnpm-lock-committed.yaml git commit -m "[skip ci] Update built files" && git push || true