web/portfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Merge minify.

Browse Source
This commit is contained in:
MajorDroolz
2022-12-20 02:25:55 -05:00
parent 2f08fa7e78
commit af34e0746f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/minify.yml vendored
View File

@@ -24,7 +24,8 @@ jobs:
- name: Copy over changes. - name: Copy over changes.
run: | run: |
git reset --hard HEAD^ git reset --hard HEAD^
git merge -Xtheirs origin main git fetch origin main
git merge -Xtheirs
- name: Minify files. - name: Minify files.
run: | run: |