Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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.
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