在Windows上工作时未出现过该问题，于是通过命令：
git diff
查看差异，得到结果：
diff --git a/start_crons.sh b/start_crons.sh old mode 100644 new mode 100755
这是由Linux严格的文件系统权限导致。
通过命令关闭filemode解决:
git config core.filemode false
在Linux上git pull线上仓库代码时，出现error: Your local changes to the following files would be overwritten by merge
免责声明！
本站转载的文章为个人学习借鉴使用，本站对版权不负任何法律责任。如果侵犯了您的隐私权益，请联系本站邮箱yoyou2525@163.com删除。
猜您在找
git pull遇到错误：error: Your local changes to the following files would be overwritten by merge
git pull时，提示Your local changes to the following files would be overwritten by merge
git pull时，提示Your local changes to the following files would be overwritten by merge
解决error: Your local changes to the following files would be overwritten by merge
git pull 提示错误,Your local changes to the following files would be overwritten by merge
git pull的时候发生冲突的解决方法之“error: Your local changes to the following files would be overwritten by merge”
git error: Your local changes to the following files would be overwritten by merge 解决方案
Laravel 5.2--git冲突error: Your local changes to the following files would be overwritten by merge:
Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决（Git代码冲突）
Error pulling origin: error: Your local changes to the following files would be overwritten by merge