To resolve a version conflict in an ATG Merchandising project:
Open the project and navigate to the Project tab.
Assets that are out of date and need to be merged with the latest version are highlighted. To see only assets with conflicts, choose Conflicting Assets Only from the Show menu.
Select the name of the asset to open it in the Details pane.
Click Review Changes.
The Review Changes page appears showing the properties that are in conflict. If there are modified properties that are not in conflict, they appear in a second table (see Undoing Property Value Changes).
The table of properties that have conflicts displays the following values:
Original Version—this is the value that you started with when you added the asset to your project.
Their Version—this is the value that was deployed by another user since you added the asset to your project.
Your Version—this is the value from your working version.
Combined Changes—this value appears only for collection properties and shows a suggested combination of Their Version and Your Version. See Conflict Resolution for Collection Properties.
Choose the value that you want to keep in your project.
When you have chosen a value for each conflicted property in the asset, click Merge as Specified Above.
The asset is updated with the property values you select.
Repeat these steps for each conflicted asset until no more asset conflicts appear on the Project tab.
If you are satisfied with your working versions, advance your project to the next task. See Advancing to the Next Task.
