FIX: minify

2022-12-20 01:58:22 -05:00
parent d63787e036
commit fd3e696013
1 changed files with 3 additions and 1 deletions
--- 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: |