Subversion resolve all conflicts quickly

不打扰是莪最后的温柔 提交于 2019-12-05 01:03:33

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.

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.

Nicola De Nisco

You can try

svn st | awk '/^C/ { print $2 }' | xargs svn revert

this revert all files with conflicts

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!