From e39da6d72418bf8a060f227d1344a7d95703d4f0 Mon Sep 17 00:00:00 2001 From: MajorDroolz Date: Tue, 20 Dec 2022 02:20:25 -0500 Subject: [PATCH] FIX: Merge minify. --- .github/workflows/minify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/minify.yml b/.github/workflows/minify.yml index e315154..8e9f4b7 100644 --- 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 pull --rebase origin main + git merge --strategy=theirs origin main - name: Minify files. run: |