问题
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.
回答1:
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.
回答2:
svn update . --accept theirs-full
Or is that not available in svn 1.4?
You could try and run the 1.5 client against a 1.4 server, might work.
回答3:
You can try
svn st | awk '/^C/ { print $2 }' | xargs svn revert
this revert all files with conflicts
来源：https://stackoverflow.com/questions/1109723/subversion-resolve-all-conflicts-quickly