Purpose of the mine-full and theirs-full commands

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

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)