我该如何纠正这个颠覆冲突、树问题？
我有一些我一直在研究的颠覆源代码。
当我尝试签入时，出现以下错误。
matth@blaze:~/dev/myproj$ svn 提交 svn：提交失败（详细信息如下）： svn: Aborting commit: '/home/matth/dev/myproj/client' 仍然存在冲突
事实上，客户端丢失了。没关系，linux下我不需要。 令人惊讶的是，它说与之存在冲突。
尝试进行更新，但什么也没显示。如何消除冲突并更新客户端以进行检查？
I have some subversion source I have been working on.
When I try to checkin I get the following error.
matth@blaze:~/dev/myproj$ svn commit
svn: Commit failed (details follow):
svn: Aborting commit: '/home/matth/dev/myproj/client' remains in conflict
In actual fact, client is missing. That's ok, I don't need it under linux.
Suprised it's saying there is a conflict with it though.
Tried doing an update but it shows nothing. How do I remove the conflict and update client to check it out?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
svn st 可能会显示“C”或“!”对于“client”目录，您要么需要签出“client”目录，要么使用提交的子目录以使其不在“client”目录中查找内容。
哎呀，错过了您在“客户端”中已经存在冲突的事实。
快速解决方案：
通常在我遇到这些情况时有效。这假设您想要保留的客户端没有任何更改。
你一开始就没有检查过客户吗？
svn st will probably show either a 'C' or an '!' for the 'client' directory, you either need to check out the 'client' directory, or use a subdirectory for the commit to make it not look in the 'client' directory for content.
oops, missed the fact that you already have a conflict in 'client'.
Quick solution:
Generally works when I encounter these situations. This assumes that there are no changes in client that you want to keep.
did you not check out client to begin with?