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 do a switch to another revision number command, svn makes weird changes in file (“<<<<<<< .mine” thing)
For example in case of xml:
<<<<<<< .mine
<TEST>hi</TEST>
<blah>sss</blah>
=======
>>>>>>> .r14827
<TEST2>yo</TEST2>
How to just switch to another revision with overwriting existing files?
You got merge on
svn uponly in case of uncommited local changes. Merge conflicts means that your changes can not be merged with update changes automatically and require human interventionCommit changes before changing content (which happens on update) of your WC