yangyu/docker
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git pull 冲突解决

Browse Source
This commit is contained in:
yangyu 2018-07-23 00:00:59 +08:00
parent 26740112f2
commit 17c6d4c1b3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hexo/start.sh
View File

@ -15,6 +15,9 @@ hexo server --cwd /hexo -p 80 > /logs/hexo.log 2>&1 &
while true; while true;
do 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; sleep 5;
done done