From af34e0746f9863ca6165c24b1797263afb01cc12 Mon Sep 17 00:00:00 2001
From: MajorDroolz <maximhutz@gmail.com>
Date: Tue, 20 Dec 2022 02:25:55 -0500
Subject: [PATCH] FIX: Merge minify.

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

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