- Created by Ashley Hickey on 2016-Dec-15
What is a Concept Merger and why do I have to review it?
When another user promotes a task to a project containing concepts that you are actively working on, the SCA tool merges those changes together and requires you to view the merged concept and either accept it, or modify it.
How do I know when my task contains merged concepts to be reviewed?
Within a project, when another user promotes as task that contains edits to a concept that you are working on you will be notified realtime that you have "Merges to Review". on the left navigational bar, the Merges to Review Button (see legend on right) will eliminate.
How to I Resolve Merged Conflicts?
Steps | Reference |
---|---|
If your rebase has generated this view. ( To See More information on how to generate merges to review see: Rebase Task - Pull in Changes From Project ) You will be presented with a tabbed list panel containing:
To view a Concept select the icon. This will load the concept into the Concept Merger Editing View. Important note: All concepts must be reviewed and either modified or accepted as-is to continue with the rebase. | |
The merged view contains a Project Version , Merged Version and Task Version . The Merged Version column is the only column that is editable.
Note: From the Merged Version you have access to all the same editing options you can perform in the main editing view. All descriptions and relationships that have been modified by you or the user who promoted the other version can be modified (case sensitivity) , etc. | |
To accept the concept as-is (or after you have modified it) select the accept merged concept button in the concept header.
This will move the concept to the Merges Accepted list. Repeat until all concept merges have been reviewed. Once all concepts have been moved to the Merges Accepted list, The Finalize Merges button will appear | |
Once a user clicks the Finalize Merges button, the system will then continue with the rebase, the user will be notified when the rebase is complete. |
Buttons related to this View
Accept Merged Version
Rebase FAQ