FIX: Merge minify.

2022-12-20 02:23:49 -05:00
parent e39da6d724
commit 2f08fa7e78
1 changed files with 1 additions and 1 deletions
--- 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: |