diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml index c9d664a..c58fdfb 100644 --- a/.github/workflows/minify.yml +++ b/.github/workflows/minify.yml @@ -21,7 +21,9 @@ jobs: run: npm i -g terser csso-cli html-minifier - name: Copy over changes. - run: git merge -s theirs main + run: | + git reset HEAD^ + git pull main - name: Minify files. run: |