SVN 提交和更新出现问题
求助：


提交文件的时候出现
commit -m "" D:/Java/eclipse3.4/workspace1/PMS_OLD/PMS/src/com/baosight/pms/pp/so/service/ServicePPSO12.java
A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: 'D:\Java\eclipse3.4\workspace1\PMS_OLD\PMS\src\com\baosight\pms\pp' remains in tree-conflict

更新文件的时候出现

update D:/Java/eclipse3.4/workspace1/PMS_OLD/PMS/src/com/baosight/pms/pp/so/service/ServicePPSO12.java -r HEAD --force
At revision 516.



[解决办法]
文件有冲突，检查一下文件，cleanup一下重新提交