by sorin » Fri Mar 27, 2009 9:59 am
Hello,
If you do an Update and both your local working copy and the SVN repository contain a version of that file that is newer than the version from which you started when you you created your new version then these two newer versions (the local one and the repository one) are in conflict. You should do a Synchronize before an Update. If the Synchronize action displays a conflict for that file first you should resolve the conflict and run Mark as Resolved or Override and Update.
If you run Update without Synchronize a conflict is created in the working copy (the files .r58 and .r60). If you run Synchronize first you see the conflict in the Synchronize view and you have the chance to merge the conflicting versions before creating a conflict in the files of the local working copy.
Regards,
Sorin