Assignment of full complete teams and their complete teams

Question

According to the docs:

(mc) my-conflict - accept my version for all conflicts (too)
(tc) their-conflict - accept their version for all conflicts (same)

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

I do not understand the difference between the * -conflict and * -full commands. It looks like it will bring you the same results.

Thank!

See this thread for a more detailed answer to this question.

Answer 1

In the "conflicting" version, the specified copy will be used only for conflicts, allowing the normal merge to work for any other changes.

Using the "full" version will use the entire file, as indicated, without considering the results of the merge.

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

Answer 2

my-conflict will use your code in every conflict situation, but will still merge regularly in all other situations.

my-full will use your entire file, discarding all changes to them.