Purpose of the mine-full and theirs-full commands
Solution 1:
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
Solution 2:
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.