Xcode和SCM冲突错误
尽管我是唯一从事该项目的人，但我收到以下错误。
> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed
为什么会发生这种情况，因为我一直在做的就是每次在进行一些认真的编码之前提交项目。我已经提交了三次，现在它不允许再提交了，因为它会抛出该错误。
I am getting this following error even though i am the only person working on this project.
> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed
why would this occur as all i keep doing is committing the project every time before do some serious coding. I have committed three times now it is not allowing any more as it throws that error.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
好吧，大家，这里是解决这个问题的具体方法，假设您的文件具有当前最新版本：
prompt$ svnresolve --acceptworkingyourfilenamehere
Resolvedconflictedstateofyourfilenamehere
然后检查通常从 xcode GUI 中。就是这样！
Ok everyone, here's precisely how to solve this problem, assuming your file has the current latest version:
prompt$ svn resolve --accept working yourfilenamehere
Resolved conflicted state of yourfilenamehere
Then check in normally from the xcode GUI. That's it!
你有一个冲突需要在 svn 中解决。如果不是其中一个文件，请检查是否是树冲突。
来自 SVN 1.6 发行说明：
You've got a conflict that needs to be resolved in svn. If it's not one of the files, check if it's a tree conflict.
From the SVN 1.6 release notes:
另一种解决方案是使用可视化客户端，例如 Versions 并从菜单中选择“解决冲突”，这似乎适用于上述和其他解决技术。
Another solution is to use a visual client such as Versions and choose "resolve conflicts" from the menu, which seems to apply the above and other resolution techniques.