git pull 冲突解决

2018-07-23 00:00:59 +08:00 · 2018-07-23 00:00:59 +08:00 · 17c6d4c1b3
commit 17c6d4c1b3
parent 26740112f2
1 changed files with 4 additions and 1 deletions
--- a/hexo/start.sh
+++ b/hexo/start.sh
@ -15,6 +15,9 @@ hexo server --cwd /hexo -p 80 > /logs/hexo.log 2>&1 &

 while true;
    do
-        cd /hexo; git pull > /dev/null 2>&1 ;
+        cd /hexo;
+        git fetch --all;
+        git reset --hard origin/$BRANCH;
+        git pull > /dev/null 2>&1 ;
        sleep 5;
    done