71

According to the docs:

(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)

I don't understand the difference between the *-conflict and *-full commands. It seems like it would get you the same results.

More: See this thread for a more detailed response to this question.

Hua-Ying
  • 3,166
  • 4
  • 23
  • 25

2 Answers2

68

The 'conflicts' version will use the specified copy for the conflicts only, letting the normal merge work for any other changes.

Using the 'full' version will use the entire file as specified, disregarding the results of the merge.

http://svnbook.red-bean.com/en/1.8/svn.tour.cycle.html#svn.tour.cycle.resolve

bahrep
  • 29,961
  • 12
  • 103
  • 150
rjohnston
  • 7,153
  • 8
  • 30
  • 37
33

mine-conflict will use your code in every conflict situation, but still do regular merging in all other situations.

mine-full will use your entire file, throwing away all changes in theirs.

digitaljoel
  • 26,265
  • 15
  • 89
  • 115
  • 5
    I'd be interested to know why the downvotes on this answer. Is it technically incorrect? It's essentially the same information as the accepted answer, just doesn't contain the link to the redbook, and it's not a copy of his answer since it was actually given before his. – digitaljoel Jun 11 '13 at 20:47