FIX: Merge minify.

2022-12-20 02:25:55 -05:00
parent 2f08fa7e78
commit af34e0746f
1 changed files with 2 additions and 1 deletions
--- a/.github/workflows/minify.yml
+++ b/.github/workflows/minify.yml
@@ -24,7 +24,8 @@ jobs:
      - name: Copy over changes.
        run: |
          git reset --hard HEAD^
-          git merge -Xtheirs origin main
+          git fetch origin main
+          git merge -Xtheirs

      - name: Minify files.
        run: |