we use version control tools but we do not use actually in our projects the merging capability. If several people has to work at the same time at the same project we split up the model into modules, libs or into several projects. We made the experience that this is the better approach.