错误说明： error: Your local changes to the following files would be overwritten by merge: apps/public/timing/test.sh Please, commit your changes or stash them before you can merge.
解决方法： 先删除文件： rm -f apps/public/timing/test.sh 然后从分支上获取（git 是分支 ） git checkout apps/public/timing/test.sh 再次执行 git pull git pull
