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

user_36464 0
Viewed 51605

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?

tortoisesvn version-control svn
6 Answers

I agree.

Seems to me that it would be more clear if it said:

  • Resolve using repository (theirs)
  • Resolve using working copy (mine)
user_1843900

If you accept that what is in the repository is no longer (solely) yours, it is shared with all that have access, then it might be clearer.

In this context:

"theirs" means "the team's shared code in the repository" "mine" means (my)"working copy" (probably on local machine)

So: "using theirs" replaces your working copy with the shared copy, discards your changes that exist on your local machine. "using mine" deciding that the code in your working copy is what should be kept in repository, discarding what is currently in the repo.

user_26043830
Related