Forum Discussion

william_roe's avatar
william_roe
Super Contributor
10 years ago

Sharing Project File While Designing

We are trying to design tests using a share project file (pjs) on the server but battling conflicts between developers. It seems to happen if a node is enabled or disabled or a new name mapping is cre...
  • Marsha_R's avatar
    Marsha_R
    10 years ago
    Our whole project is in Subversion and we each check out our own copy.



    If I add or change a keyword test, I add it to Subversion or check it in on my own and let the group know.  Whoever needs the test can update to get a new copy.



    For the name mapping, there is a Merge with function in TestComplete.  

    http://support.smartbear.com/viewarticle/55712/



    I give a copy of my name mapping file to the lucky person who gets to do the merge this week.  All updated name mapping files are merged in one at a time and conflicts are resolved on the one local machine.  That person checks the final file back into subversion and we each update ours from there.





Marsha_R's avatar
Marsha_R
Moderator
10 years ago
We work with separate copies of project files and name mapping to avoid the conflicts.  



Project files we never check in, but if a setting or variable is updated, we share that information with the group.  



Name mapping we merge, but only once a week or so when changes are being made.  One person gets copies of all the different name mappings and merges them one at a time, then tests the merged copy and checks it in.  Everyone else updates after that.