问题描述
$ svn commit -m "update"
svn: Commit failed (details follow):
svn: Aborting commit: '/data/users/huser/svn/presto-fin' remains in conflict
解决方法:
svn remove --force filename
svn resolve --accept=working filename
svn up
问题描述
$ svn commit -m "update"
svn: Commit failed (details follow):
svn: Aborting commit: '/data/users/huser/svn/presto-fin' remains in conflict
解决方法:
svn remove --force filename
svn resolve --accept=working filename
svn up