Forum Discussion
Marsha_R wrote:Here's what we worked out in order to keep everything straight.
The master copies of our tests reside in subversion. Each person working on tests checks out their own copy of the tests, works on those or adds new ones, and commits changes as needed. Those merges are handled automatically.
Name mapping is merged manually every few days. One person takes the new name mappings from all the others and merges them one at a time inside TestComplete and deals with any issues. Once that new master copy is created, then that one is committed in subversion and is then available for everyone to use.
For overnight testing, a separate copy of the whole project is retrieved from subversion and the tests are run from that copy. We don't include a test in the overnight run until the name mapping that it needs has been merged.
Does that help?
It's still not clear how the merging of the name mapping within TC works. Whenever we merge we get a conflict message with no mechanism to resolve.
We never receive the dialog shown in http://support.smartbear.com/viewarticle/55712/
william_roe : After that dialog, try searching the name mapping for _new - that's the only way we find the conflicts.
AlexKaras: We thought about something like that but no one wanted to be the dedicated person ;) All of us know how to do it so we spread the pain around.
Related Content
- 6 months ago
- 7 years ago
- 2 years ago
Recent Discussions
- 11 hours ago