From a24a402065e5d79d15b850cca5969498c2b23d70 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Sat, 14 Jul 2018 20:39:11 -0400
Subject: [PATCH] Forcing git resets to head before git pull

---
 Makefile           | 12 ++++++------
 Setup_Linux_Mac.sh |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3ddd42d..fb4d340 100644
--- a/Makefile
+++ b/Makefile
@@ -34,22 +34,22 @@ clone-windows-wiki:
 	@git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
 
 pull-game:
-	@$(shell cd Game && git pull)
+	@$(shell cd Game && git reset HEAD --hard && git pull)
 
 pull-website:
-		@$(shell cd Website && git pull)
+		@$(shell cd Website && git reset HEAD --hard && git pull)
 
 pull-wiki:
-	@$(shell cd Website/Wiki && git pull)
+	@$(shell cd Website/Wiki && git reset HEAD --hard && git pull)
 
 pull-game-windows:
-	@cd Game && git pull
+	@cd Game && git reset HEAD --hard &&  git pull
 
 pull-website-windows:
-	@cd Website && git pull
+	@cd Website && git reset HEAD --hard &&  git pull
 
 pull-wiki-windows:
-	@cd Website/Wiki && git pull
+	@cd Website/Wiki git reset HEAD --hard &&  && git pull
 
 logs:
 	@docker-compose logs -f
diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh
index 24d3bd7..693f85c 100755
--- a/Setup_Linux_Mac.sh
+++ b/Setup_Linux_Mac.sh
@@ -266,7 +266,7 @@ fi
 clear
 echo "Checking the Docker Home git repo for any recent updates."
 echo ""
-git pull
+git reset HEAD --hard && git pull
 echo ""
 clear
 echo "${RED}Open RSC Installer:${NC}