当从基于团队的Git远程仓库拉取代码时,我会收到以下消息:
"C:\Program Files (x86)\Git\bin\git.exe" pull --progress "origin" +refs/heads/master:refs/remotes/origin/master
Updating 71089d7..4c66e71
error: Your local changes to the following files would be overwritten by merge:
Source/Reporting/Common/Common.Dal.csproj
Please, commit your changes or stash them before you can merge.
Aborting
Done
Git中的什么规则(或特性)可以确保我在工作目录中修改的文件不会被pull覆盖?
换句话说,在什么情况下它会被pull覆盖?或者说...我需要做什么来强制执行pull以覆盖我刚刚修改的文件?
git merge origin/master
。如果您不关心这些更改,可以放弃它们:git stash drop
。 - Tacocat