March 09
Prof. Ismael H. F. Santos                                                                               2
Details: resolve
nCleans up conflict files left from a conflict during “svn update” or “svn merge”
$ ls file6*
file6
file6.63212.00001.working
file6.63216.00001.r16
file6.63220.00001.r15
$ svn resolve file6
Resolved conflicted state of file6
$ ls file6*
file6
$
Similar to CVS, Subversion inserts conflict markers into the conflicted source file (“file6” in this example).