If you do a source control operation outside the Studio, such as through the native GUI of the source control provider, make sure you include the .sid file from the links directory. For example, if you check out a page object from the source control system, you have to simultaneously check out its .sid file. Otherwise, the change isn't visible to the Studio. Exclusive lock is required for multiple user team development. Don't try to merge object level changes.
Team development merges on the project level.
As a general rule, you should perform team development operations from within the Studio instead of interacting with the source control system directly. You can perform operations directly through the source control system, but you have to take extra steps to make these operations visible to the Studio. Before You Begin To use team development, you must have access to a NetDynamics-certified source control system. You also must have a source code control client correctly installed and configured on your development machine. Before you can use team development for a project, you have to enable it.