views:

66

answers:

2

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?

+6  A: 

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.

Brandon
Check out the image which explains a lot about this: http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html
Stefan
A: 

I want to add whole list for further referance

(e)  edit             - change merged file in an editor
(df) diff-full        - show all changes made to merged file
(r)  resolved         - accept merged version of file

(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict    - accept my version for all conflicts (same)
(tc) theirs-conflict  - accept their version for all conflicts (same)

(mf) mine-full        - accept my version of entire file (even non-conflicts)
(tf) theirs-full      - accept their version of entire file (same)

(p)  postpone         - mark the conflict to be resolved later
(l)  launch           - launch external tool to resolve conflict
(s)  show all         - show this list
nerkn