svn file conflict:
DC filename > local unversioned, incoming File the Add Update upon svn Revert file name Tip: restored "filename"
Under understand the way: svn revert usage.
revert to rollback.
Modified things did not submit (commit), changes made before the cancellation will revert this case usage: #svn revert [ - R] xxx_file_dir If you need to roll back of the catalog is a plus -R (recursive) optional parameters
back roll version submitted using the Merge svn
svn -r Merge the current version number: the need to roll back the version number of the document