From 3a788fc135035826e9415b2e01e0937ce72f767e Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Sun, 9 Jan 2022 00:12:18 -0600
Subject: [PATCH] Updated run to reset before pulling and only fast forward
 while pulling.

---
 run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index 02ab117..5717054 100755
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 git checkout master
-git pull origin master
+git reset --hard
+git pull origin master --ff-only
 
 java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui
\ No newline at end of file