From b0499a62aae7fa5156dc2e677abac9798db177c7 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Sun, 1 Jun 2025 12:16:16 +0200 Subject: [PATCH] chore: use 'git checkout -f' instead of 'git reset --hard' to avoid loss --- UPDATE AND START SERVER.bat | 2 +- UPDATE AND START SERVER.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UPDATE AND START SERVER.bat b/UPDATE AND START SERVER.bat index 983b8f8d..7f0bd170 100644 --- a/UPDATE AND START SERVER.bat +++ b/UPDATE AND START SERVER.bat @@ -3,7 +3,7 @@ echo Updating SpaceNinjaServer... git fetch --prune git stash -git reset --hard origin/main +git checkout -f origin/main if exist static\data\0\ ( echo Updating stripped assets... diff --git a/UPDATE AND START SERVER.sh b/UPDATE AND START SERVER.sh index d33afba9..e57c8061 100755 --- a/UPDATE AND START SERVER.sh +++ b/UPDATE AND START SERVER.sh @@ -3,7 +3,7 @@ echo "Updating SpaceNinjaServer..." git fetch --prune git stash -git reset --hard origin/main +git checkout -f origin/main if [ -d "static/data/0/" ]; then echo "Updating stripped assets..."