1
edit
Changes
SVN
,→svn resolved
<pre>
$ svn update
Updated to revision 46.
$ ls -1
sandwich.txt
sandwich.txt.mine
sandwich.txt.r1
sandwich.txt.r2
</pre>
:C in front of a filename stands for conflict. Changes from the server overlapped with your own.
:For every conflicted file, subversion places up to 3 extra unversionfiles in your working copy (sandwich.txt.mine, sandwich.txt.r1, sandwich.txt.r2)
*At this point, Subversion will <b>not</b> allow you to commit the file <i>sandwich.txt</i> until the three temporary files are removed.
*You need to do one of three things:
*Merge the conflicted text “by hand” (by examining and editing the conflict markers within the file).
*Copy one of the temporary files on top of your working file.
*Run <b>svn revert <filename></b> to throw away all of your local 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:
Once you've resolved the conflict, you need to let Subversion know by running svn resolved. This removes the three temporary files and Subversion no longer considers the file to be in a state of conflict.[4]
<pre>
$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'
</pre>
==Commit your changes==
