diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml index e315154..8e9f4b7 100644 --- a/.github/workflows/minify.yml +++ b/.github/workflows/minify.yml @@ -24,7 +24,7 @@ jobs: - name: Copy over changes. run: | git reset --hard HEAD^ - git pull --rebase origin main + git merge --strategy=theirs origin main - name: Minify files. run: |