svn不能提交 svn: is out of date; try updating

今天做项目合并的时候突然不能提交了，开始以为是和服务器的有修改冲突，然后更新一下发现还是不能提交，每次都报is out of date;还原文件 -> 修改 -> 提交 -> 仍然报错。解决方法分享下

报错信息：

Merge conflict during commit

svn: Commit failed (details follow):

svn: File or directory 'Ss17InteractionImpl.java' is out of date; try updating

svn: The version resource does not correspond to the resource within the transaction.  Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).

解决方法：

1.服务器版本和本地有冲突，更新后再提交

2.没有冲突但就是提交不了。删除svn下的文件  all-wcprops

删除根目录下.svn下面的all-wcprops文件就OK。