From 6a216be5cbeb6af1e38a29139d9717400219ecdf Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 15 Aug 2023 13:31:08 +0530
Subject: [PATCH] Force-clean the local git repo, even if it has some unmerged
 changes

---
 scripts/on_env_start.bat | 2 ++
 scripts/on_env_start.sh  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 43f7e2b7..d0e915e2 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -46,6 +46,8 @@ if "%update_branch%"=="" (
 
     @cd sd-ui-files
 
+    @call git add -A .
+    @call git stash
     @call git reset --hard
     @call git -c advice.detachedHead=false checkout "%update_branch%"
     @call git pull
diff --git a/scripts/on_env_start.sh b/scripts/on_env_start.sh
index 02428ce5..6fd61c26 100755
--- a/scripts/on_env_start.sh
+++ b/scripts/on_env_start.sh
@@ -29,6 +29,8 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in
 
     cd sd-ui-files
 
+    git add -A .
+    git stash
     git reset --hard
     git -c advice.detachedHead=false checkout "$update_branch"
     git pull