From d642fa656117a5de9a33d6d388cff502f80fb5ae Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Tue, 15 Mar 2022 20:57:48 -0400
Subject: [PATCH] Update dashy-update.sh

---
 misc/dashy-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/dashy-update.sh b/misc/dashy-update.sh
index f0a309f8..f38228f7 100644
--- a/misc/dashy-update.sh
+++ b/misc/dashy-update.sh
@@ -18,7 +18,7 @@ echo -e "${CM}${CL} \r"
 
 echo -en "${GN} Updating Dashy... "
 cd /dashy
-git merge &>/dev/null
+git stash &>/dev/null
 git pull origin master &>/dev/null
 yarn &>/dev/null
 yarn build &>/dev/null