save conflicts, merges with test artificats in projects that are not enabled for configuration management?
Hi,
I recently noticed the following "save conflict" dialog box after making changes to a test plan in 2 different browser tabs: 
If I click "merge" I can I can resolve differences between the "versions" of the test plan. The knowledge center here https://www.ibm.com/support/knowledgecenter/SSYMRC_6.0.1/com.ibm.rational.test.qm.doc/topics/c_compare_merge.html?cp=SSYMRC_6.0.1&lang=en "Compare and merge operations for test artifacts" says "In projects that are enabled for configuration management, you can compare your current configuration with another configuration. For artifact types that show differences in the compare session, you can open a detailed comparison editor to view differences between two versions of a test artifact." I am trying to understand how this merge option exists in a project that is not enabled for configuration management and/or what difference exists for merging test artifacts when configuration management is enabled. Thanks, Brett |
Accepted answer
I believe the merge operation does not require Configuration Management. Even in pre-6.0 versions, some test artifact types, such as Test Plan, are already "versioned" (via the stateId attribute). We just do not provide the merge operation in earlier versions and force a refresh when conflicts arise.
I believe the only difference between opt-in projects and opt-out project, in terms of the merge operation, is where to get the latest version of the artifact. Brett Bohnn selected this answer as the correct answer
|
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.
Comments
Hi, Brett
This is a new feature introduced in 6.0 on top of GC. if you read through the help contents you mentioned, it says:
In all projects, you can compare and merge supported test artifacts if you and another team member edit a test artifact at the same time and encounter a save conflict. In that case, if you save your changes after the other person, you must either cancel your changes or merge your changes with the other team member's version of the test artifact. For more information about save conflicts, see Save conflicts for test artifacts.
It says all projects including normal project without GC enabled. This feature only implemented to test plan, test case and test suite. I believe it uses the same way to detect the conflict and throw the warning message in non GCed project and the comparison feature in GCed project.