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

Solution 1:

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.

Solution 2:

I wanted to add the whole list for further reference:

(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

Solution 3:

I agree.

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

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