FIX: Merge minify.

2022-12-20 02:32:46 -05:00
parent 6077bf7d69
commit 479bc75c62
1 changed files with 3 additions and 3 deletions
@@ -23,9 +23,9 @@ jobs:
      - name: Copy over changes.
        run: |
-          git reset --hard HEAD^
+          git branch -D build
-          git fetch origin main
+          git branch build
-          git merge -Xtheirs
+          git checkout build
      - name: Minify files.
        run: |