workflow fix

2025-05-25 01:18:45 -07:00 · 2025-05-25 01:18:45 -07:00 · db0c3490e1
commit db0c3490e1
parent 9eb0dacd1c
1 changed files with 3 additions and 1 deletions
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@ -21,5 +21,7 @@ jobs:
          script: |
            ls
            cd Homepage
-            git pull
+            git fetch
+            git reset --hard HEAD
+            git merge '@{u}'
            hugo && rsync -Oavz --no-p --delete public/ /var/www/melm.xyz