mpo Wrote:tortoise tell me that there's a conflict with the file src/SConscript, what does it mean? What i have to do?
Open the file src/SConscript and find the area that changed. Subversion puts stuff in there to show what your revision had, and what got updated. You need to select one version or manually merge in the changes, and delete the extra stuff that Subversion puts in there for you. Then tell Subversion that this file is resolved.
If you don't care about your changes and just want the latest thing in the repository, delete the file and then do an update in Subversion. That will restore the file as it is in the repository.
