SVN 更新，未提交更改的本地文件会发生什么?
问题描述：
假设我有一个正在处理的本地文件，它是存储库的一部分.本地文件具有本地更改且已保存到本地文件但尚未提交.当我去更新整个存储库时会发生什么?
Suppose I have a local file that I am working on that is part of a repository. The local file has changes that are local and have been saved to the local file and have yet to be committed. What happens when I go to update the whole repository?
SVN 是否会尝试将 HEAD 与本地副本合并(希望没有冲突)，或者 SVN 是否会只保留本地副本直到稍后提交?
Is it the case that SVN will try and merge the HEAD with the local copy (hopefully sans conflicts) or will SVN just leave the local copy alone until it is committed later?
答
它会将 HEAD 与您的本地副本合并.如果更改发生冲突 - 您会遇到很好的冲突.
It will merge HEAD with your local copy. If the changes collide - you get a nice conflict.