Tortoise SVN: Resolve conflict using 'theirs'. What does it mean?

svn version-control tortoisesvn
Muhammad Hasan Khan picture Muhammad Hasan Khan · Oct 25, 2010 · Viewed 47.4k times · Source

Can someone please explain the difference between the following two options of Tortoise SVN on conflicted files:

  • Resolve conflict using 'theirs'.
  • Resolve conflict using 'mine'.

On a side note. Why on earth no one has ever reported this confusing use of terminology as a bug?

Answer

Brandon picture Brandon · Oct 25, 2010

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.

Related questions

TortoiseSVN Error: "OPTIONS of 'https://...' could not connect to server (...)"

I'm trying to setup a new computer to synchronize with my SVN repository that's hosted with cvsdude.com. I get this error: ![SVN Error][1] - removed image shack image that had been replaced by an advert Here's what I did (…

Read More
SVN Repository on Google Drive or DropBox

Is it possible to setup SVN repo/server on google drive or dropbox etc? I want to put my PhD project under version control. The data has to stay private and only accessible to me and my supervisors. I can't …

Read More
How do I remove a folder from source control with TortoiseSVN?

How do I remove a folder from being source controlled with TortoiseSVN?

Read More