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.
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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.
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.