The scenario merge workflow is a part of the Ardoq scenarios feature.

The data section of the merge workflow lets you merge changes to components, references, and tags from the mainline to the scenario, and from the scenario to the mainline.

Head here to learn more about how to keep the metamodel between your scenario and mainline in sync with the metamodel merge workflow.

Steps in the Data Section

The workflow will take you through a series of steps for the components, references, and tags where there have been changes.

ardoq steps in the data section

Components

Delete Components

For components that are deleted in the source, you can either select to accept the deletion or to keep the component.

ardoq delete components

Create Components

For components that are created in your scenario, you can choose to also create them in the mainline when merging.

ardoq create components

When merging a component, there is a prerequisite that the parents of the components exist in the mainline. If these have been deleted, you'll be given the option to recreate the parents in order to merge the component.

The create components step is available only when creating components from your scenario in the mainline. New components in the mainline will not show up in the merge workflow from the mainline to the scenario. The merge workflow revolves around components that have been explicitly included.

Update Components

When merging components that have updated field values, you'll be able to choose the value from either the mainline or the scenario. The column original value shows what the value was - either when you created the scenario or the last complete merge.

If a field value is changed either in the scenario or the mainline, the updated value is preselected. If the value is changed in both the scenario and the mainline, the status column shows a red dot, and no preselection is made.

ardoq update components

References

Delete References

Same as for components, for references that are deleted in the source, you can either accept the deletion, or keep the reference.

ardoq delete references

Create references

References that are created between components in your scope can be accepted into your branch.

ardoq create references

When creating a reference, it is a prerequisite that both the source and the target component exists. If it doesn't exist, or any of their parents is missing, you will be given the option to recreate them before continuing.

Update References

When merging references that have updated field values, you'll be able to choose the value from either the mainline or the scenario. The column original value shows what the value was - either when you created the scenario or the last complete merge.

If a field value is changed either in the scenario or the mainline, the updated value is preselected. If the value is changed in both the scenario and the mainline, the status column show a red dot, and no preselection is made.

ardoq update references

Tags

Delete Tags

When deleting a tag you will also see all the components and references that currently use that tag.

ardoq delete tags

Create Tags

When accepting the creation of a tag, you'll also see all the components and references that will be tagged.

ardoq create tags

Update Tags

Tags only have a name and a description, so those two properties are the only ones that can change here. The update table for this follows the same pattern as the previous update tables.

Merge Tags

The final step of the tag merge will show you a table that shows where the tag applied originally, either when creating the scenario or at the last merge, as well as where the tag applies in the mainline and the scenario. The checkboxes can be used to select whether the tag should apply or not.

ardoq merge tags

If you still have questions or need more information, reach out to us via our website or by using the in-app chat.

Did this answer your question?