From fd3e696013393e5b54454266df8fee3d4db3a7db Mon Sep 17 00:00:00 2001
From: MajorDroolz <maximhutz@gmail.com>
Date: Tue, 20 Dec 2022 01:58:22 -0500
Subject: [PATCH] FIX: minify

---
 .github/workflows/minify.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml
index c9d664a..c58fdfb 100644
--- 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: |