Merging changes between concurrent users

In a locked profile, only one user is allowed to modify a version at any given time. But in the case of an unlocked profile, several users are able to make changes in the same version at the same time. In the event that one of them saves or publishes their version first, the remaining concurrent users are alerted to the new change.

In this event, the remaining users have the opportunity to salvage any changes they made in that version before it was overwritten. This is made possible by Merge Changes, a feature built into Tealium iQ for resolving concurrent user situations. This feature is automatically invoked the instant it detects a combination of saved and unsaved changes inside the same version. It then allows concurrent users to merge their unsaved changes with the saved changes in order to keep from losing their efforts.

How Merge Changes works

In this scenario, User A is editing a certain Version X and overwrites it with Save/Publish just when User B is also editing it. Version X now has an update, along with unsaved changes. What can User B do to salvage their changes? There are two options to saving changes:

• Merge the new version into your current work: Keeps B’s and A’s changes together in a new version.
• Continue working and save later: User B continues to work and can save as a new version later.

The Concurrent Notification alert message is a cue for you to take action.

Merge your changes with another user’s saved changes

To bring concurrent changes into your version:

1. Select the Merge the new version into your current work option and then click OK
2. In the next window, you are presented a list of the other user’s changes that were saved ahead. Check the items you wish to merge into your version. Unchecked items are NOT merged.

   

3. Review the changes in the confirmation window and click Merge to complete.

   

4. Save/Publish to place all the changes into a new version. For more information, see Save and Publish a Version.

   

Concurrent users will see an alert that announces your new version. If they want to view your new version, they should save their work in progress first.

Save your changes without merge

If you decide to keep only your changes and discard the other user’s changes, perform a Save As without merging:

1. Select the Continue working and save later option and click OK.

2. Click Save/Publish to save your changes into a new version.

   

3. Save your changes as a new version. For more information, see Save and Publish a Version.

Watch this video tutorial on how to merge changes between concurrent users.

Resolve conflicts before merge

Conflicts arise when you to attempt to merge the saved and unsaved instances of the same Tealium iQ element. This is typically the case when the element is modified by several users at the same time. For example, a certain load rule condition with a date range will conflict and collide with same load rule condition without a date range. Merging the two load rules is not possible unless you accept one instance and discard the other.

To resolve a conflict from the Merge Changes window:

1. Click the eye icon to reveal the conflicting changes.

   

2. Read the configurations and determine which instance you wish to keep.

3. Click the Use this bar to move your desired change into the Accepted Changes column. Unaccepted changes will be discarded before merging.

   

4. Proceed to merge then Save/Publish your version.

Troubleshoot merge issues

The merging operation may fail if you lack required permissions in the account, or when different versions of linked libraries are present in the version. More details are available in the troubleshooting guide.