SVN 树冲突 - 只想获取文件？
老 SourceSafe 用户，不得不切换到 SVN。因此，主干中的项目之一总是说“Tree Conflict”。我没有在其中做过任何工作（或者至少没有我需要保留的东西）。我只想“获取”存储库中的确切内容。删除文件夹并更新似乎没有解决问题。这应该很简单；我不关心文件夹中的内容，我只想要存储库中的内容。如何从 SVN“获取”（用 VSS 术语）项目？
old SourceSafe user here, having to switch to SVN. So, one of the projects in the trunk always says "Tree Conflict". I haven't done any work in it (or at least nothing I need to keep). I just want to "Get" exactly what's in the Repository for it. Deleting the folder and updating doesn't seem to do the trick. This should be simple; I don't care about what I have in the folder, I just want what's in the Repository. How do I "Get" (in VSS terms) a project from SVN?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
svn checkout
我建议使用客户端也像 TortoiseSVN 。
当未使用 SVN 命令移动/删除文件时，通常会发生树冲突。但是，在对新文件夹进行全新检出时，决不应该发生冲突。通过在文件资源管理器中显示“隐藏”文件和文件夹，确保该文件夹没有附加任何 svn 信息。您可以尝试删除 .svn 文件夹（如果存在）或在没有 .svn 文件的目录中创建新的签出位置。
svn checkout
I recommend using a client like TortoiseSVN as well.
Tree conflicts usually occur when a file has been moved/deleted without using the SVN command to do so. However, there should never be a conflict when doing a fresh checkout into a new folder. Make sure the folder doesn't have any svn information attached to it by displaying "hidden" files and folders in your file explorer. You can try deleting the .svn folders if they exist or make a new checkout location in a directory that has no .svn files.