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

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?

73
задан clami219 25 August 2014 в 11:14
поделиться