diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml index 8e9f4b7..77c74f7 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 merge --strategy=theirs origin main + git merge -Xtheirs origin main - name: Minify files. run: |