SVN

问题

使用 : svn commit -m "我在提交"

报如下错误

svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/Users/moocking-ios/Desktop/FenShuXian_ios/FSX/FSX.xcodeproj/project.xcworkspace/xcuserdata/moocking-ios.xcuserdatad/UserInterfaceState.xcuserstate' remains in conflict
moockingComputer:FSX moocking-ios$ svn resolved /Users/moocking-ios/Desktop/FenShuXian_ios/FSX/FSX.xcodeproj/project.xcworkspace/xcuserdata/moocking-ios.xcuserdatad/UserInterfaceState.xcuserstate
Resolved conflicted state of 'FSX.xcodeproj/project.xcworkspace/xcuserdata/moocking-ios.xcuserdatad/UserInterfaceState.xcuserstate'

错误原因:
svn服务器上的文件与本地的文件不相匹配 本地多出了某些文件 svn服务器没有

解决办法

使用: svn resolved 具体文件

如:

Snip20170623_6.png

如果你的问题没有得到解决可以参考一下这个: https://stackoverflow.com/questions/2406469/svn-remains-in-conflict