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

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

diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml
index aadf6e9..c9d664a 100644
--- a/.github/workflows/minify.yml
+++ b/.github/workflows/minify.yml
@@ -10,6 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: build
+      
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
@@ -17,6 +20,9 @@ jobs:
       - name: Install dependencies.
         run: npm i -g terser csso-cli html-minifier
 
+      - name: Copy over changes.
+        run: git merge -s theirs main
+
       - name: Minify files.
         run: |
           for i in `find . -name "*.js" -type f`; do terser $i --compress -o $i; done
@@ -35,4 +41,3 @@ jobs:
           assignees: MajorDroolz
           reviewers: MajorDroolz
           branch: temp
-          base: build