Changes

*Once you've resolved the conflict, you need to let Subversion know by running <b>svn resolved</b>. This removes the three temporary files and the file is no longer in a state of conflict:

<pre>

$ svn resolved sandwich.txt