1
edit
Changes
SVN
,→svn resolved
===svn update===
===svn resolved===
*You can predict conflicts by the file codes:
<pre>
$ svn update
U INSTALL
G README
C filename1.c
Updated to revision 46.
</pre>
:C in front of a filename stands for conflict. Changes from the server overlapped with your own.
==Commit your changes==