错误信息如下:
commit -m "" E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx/checkplDyzkz.jsp E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx/checkDyzkz.jsp E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx/ckWbxxlist.jsp E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx/plDyzkz.jsp
Operation failed because E:/Workspace_byzs/zftal-byzs/src/main/webapp/WEB-INF/pages/zsxt/wsbm/bmxx remains in conflict.
A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: 'E:\Workspace_byzs\zftal-byzs\src\main\webapp\WEB-INF\pages\zsxt\wsbm\bmxx' remains in tree-conflict
解决方案:右击问题文件夹->team->Show Tree Conflict->在Eclpise中会出现一个Tab视图显示Tree Conflict的内容,一
个一个选择列表中的冲突右击将其标志为已解决