在sourcetree拉取项目时,报如下错误:
error: Your local changes to the following files would be overwritten by merge:
中间一大堆文件
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
分析错误原因是,自己在本地上面修改了某个文件代码,并没有提交到服务器,而团队其他成员也修改了这个文件的代码并提交到了服务器,在sourcetree上从服务器拉取项目到本地时发生了冲突,解决方法如下:
强制覆盖本地数据:
git fetch origin
git clean -f
git reset --hard origin/master