瀏覽代碼

Update dashy-update.sh

tteckster 3 年之前
父節點
當前提交
056a2a8b74
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      misc/dashy-update.sh

+ 1 - 1
misc/dashy-update.sh

@@ -41,7 +41,7 @@ echo -e "${CM}${CL} \r"
 
 
 echo -en "${GN} Updating Dashy... "
 echo -en "${GN} Updating Dashy... "
 cd /dashy
 cd /dashy
-git stash &>/dev/null
+git merge &>/dev/null
 git pull origin master &>/dev/null
 git pull origin master &>/dev/null
 yarn &>/dev/null
 yarn &>/dev/null
 yarn build &>/dev/null
 yarn build &>/dev/null