错误提示为：
org.apache.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: ' 上传文件的地址l' remains in conflict
svn: Commit failed (details follow):
svn: Aborting commit: ' 上传文件的地址l' remains in conflict
解决方法：
右键点击选择上传的文件，选择Team>标记为解决>
然后选择你的错误信息