From db0c3490e1b7f9737e69d9d5266f80f2f4cf3216 Mon Sep 17 00:00:00 2001
From: themelm <themelm@pm.me>
Date: Sun, 25 May 2025 01:18:45 -0700
Subject: [PATCH] workflow fix

---
 .forgejo/workflows/deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index bf34316..4ea4d64 100644
--- 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