SVN 中提交时 ，出现 ..... remains in conflict的错误

提交SVN的时候出现以下错误

xiaohandeMacBook-Pro:SchoolHelper hansen$ svn ci -m "修改bug"

svn: E155015: Commit failed (details follow):

svn: E155015: Aborting commit: '/Users/hansen/Documents/schoolhelper/ios/SchoolHelper /SchoolHelper/OALeftVC.m' remains in conflict

解决办法：

xiaohandeMacBook-Pro:SchoolHelper hansen$ svn resolved OALeftVC.m

如果没有提示，说明冲突解决，就可以重新 commit 了