Subversion快速解决所有冲突 [英] Subversion resolve all conflicts quickly

问题描述

当我有多个冲突时，是否有办法通过仅告诉SVN保留存储库中的版本来解决所有冲突？不幸的是，我们仍然使用1.4。

When I have several conflicts, is there a way to resolve them all by just telling SVN to keep the version that is in the repository? Unfortunately, we're still using 1.4.

推荐答案

我相信如果您运行命令 svn revert。 -R ，您基本上撤消了对工作副本的所有更改。如果存在冲突的文件，SVN会放弃所做的更改，并使用您最近更新的修订版。

I believe if you run the command svn revert . -R, you basically undo all changes to your working copy. If there are conflicted files, SVN tosses out your changes and uses the revision you've most recently updated to.

当然，这也消除了对文件的更改，没有冲突。

Of course, this also gets rid of changes to files that aren't conflicted.

这篇关于Subversion快速解决所有冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！