SCM Usage / Locking |
There are three user strategies for working with locks in Genero Studio; use svn:needs-lock on some files, on all files, or not at all.
With this strategy, no commit conflicts can occur because no two users can modify the same file at the same time. You will have to lock the file before modifying it. Locked files must be unlocked after commit.
This strategy can be used when all the files can be merged manually in case of conflicts. In case of binary files it is not possible to merge the changes, so modifying the files without locking must be avoided. If the file is not locked and modified, you may have to manually merge the changes in case of commit conflicts.