Conflicts (1/5)

If you use Subversion for long enough (especially in large projects with many developers), you will eventually see a dreaded conflict: : jmglov@laurana; svn up C haiku.txt Updated to revision 11.
The big, fat “C” means that SVN tried to merge the differences in the file automatically, but failed
All is not lost! Unlike CVS's fairly primitive conflict resolution, SVN gives you a wealth of options.

If you use Subversion for long enough (especially in large projects with many developers), you will eventually see a dreaded conflict: : jmglov@laurana; svn up C haiku.txt Updated to revision 11.