diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml index 77c74f7..db48ad1 100644 --- a/.github/workflows/minify.yml +++ b/.github/workflows/minify.yml @@ -24,7 +24,8 @@ jobs: - name: Copy over changes. run: | git reset --hard HEAD^ - git merge -Xtheirs origin main + git fetch origin main + git merge -Xtheirs - name: Minify files. run: |