From 2d7c7df78f481aa67319042e422346c8131f1ba3 Mon Sep 17 00:00:00 2001
From: Exos9 <pomamax@proton.me>
Date: Tue, 13 Jan 2026 21:46:21 +0100
Subject: [PATCH] Fixed the startup script (again again)

---
 Linux/Server/startup-server.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Linux/Server/startup-server.sh b/Linux/Server/startup-server.sh
index 2cb3c16..c3c99d0 100644
--- a/Linux/Server/startup-server.sh
+++ b/Linux/Server/startup-server.sh
@@ -6,7 +6,8 @@ CLEAN_REPO_URL=$(echo "${GIT_REPO_URL}" | sed 's|^https://||')
 
 if [ -d .git ]; then
     echo "Pulling latest changes from the repository..."
-    git pull "https://${GIT_USERNAME}:${GIT_PAT}@${CLEAN_REPO_URL}" "${GIT_BRANCH}" || true
+    git fetch "https://${GIT_USERNAME}:${GIT_PAT}@${CLEAN_REPO_URL}" "${GIT_BRANCH}"
+    git reset --hard FETCH_HEAD
 fi
 # Constants
 EXTENSIONS="yml json conf properties"  # Space-separated list of extensions