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:47:21 +08:00
parent 17c6d4c1b3
commit 44cba1ed8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hexo/start.sh
View File

@ -16,8 +16,8 @@ hexo server --cwd /hexo -p 80 > /logs/hexo.log 2>&1 &
while true; while true;
do do
cd /hexo; cd /hexo;
git fetch --all; git fetch --all > /dev/null 2>&1 ;
git reset --hard origin/$BRANCH; git reset --hard origin/$BRANCH > /dev/null 2>&1 ;
git pull > /dev/null 2>&1 ; git pull > /dev/null 2>&1 ;
sleep 5; sleep 5;
done done