Subversion resolve all conflicts quickly

svn conflict resolve
nategood picture nategood · Jul 10, 2009 · Viewed 20.7k times · Source

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.

Answer

Nick Meyer picture Nick Meyer · Jul 10, 2009

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.

Related questions

SVN checkout without restoring

We have some company middleware and sometimes its difficult to find the correct version Im looking for so I often have to update to different versions to test them. I usually checkout: svn co svn+ssh://(username)@(ip)/srv/svn/…

Read More
How to merge conflicts (file project.pbxproj) in Xcode use svn?

There are two members in our team. We use Xcode's SCM (use SVN) to manger our source code files. We all add files to our Xcode project. He has committed to SVN server. When I update, Xcode find there has …

Read More
Is it possible to always (force) overwrite local changes when updating from SVN? Ignore conflicts?

I know I should be working on a branch of my own but a couple of us are on the same branch of a project. One of the Dev's made a commit and I just wanted to update my local …

Read More