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.
Can someone please explain the difference between the following two options of Tortoise SVN on conflicted files:
On a side note. Why on earth no one has ever reported this confusing use of terminology as a bug?
Resolve conflict using ‘theirs’ means that when you try to check in two files that have conflicting edits, SVN will discard your changes and use the other persons change instead.
Resolve conflict using ‘mine’ means that you will discard their changes, and use your version of the file instead.