Merging Two Projects into one

Thanks for a detailed description of the question. It is actually an important question, and we realize this. That's why we created the "Teamwork" help topic to tell about some standard approaches: http://support.smartbear.com/viewarticle/27356/ In a nutshell, all the rules come to just a couple of ideas: - do not merge anything that is not a script unit file; - for everything except for script unit files, disable multiple checkout in your SCC system. This means that you need to organize your tests structure in a way, so that the situation when several people need exclusive access to the same project item occurs as rare as possible. Please read more details in the mentioned Help system section - there are multiple useful topics there. As a rule, the most problematic thing is the Name Mapping file - exclusive access to this file may be required too often. However, we don't have a universal solution here, unfortunately. Possible approaches include: - Having several projects with an isolated Name mapping file in each project. Every of the projects may be bound to testing a specific part of the tested application, sot that the Name Mapping schemes overlap only on the Process and main window level. - Separating the Name Mapping structure creation, and the test logic creation, so that one person creates the Name Mapping structure for a specific part of the tested application, then check in the changes, and continues creating the test logic, while another tester creates another part of the Name Mapping scheme. - Not using Name Mapping, and addressing objects by their non-mapped names, according to the Object Browser structure. There may be other approaches suitable for your specific situation.