When you advance your project to the next task, Merchandising attempts to automatically resolve all the conflicts in your project. You can, however, automatically resolve conflicts in your project at any time, without moving it out of the Author stage.
To automatically resolve version conflicts in a Merchandising project:
In a Merchandising project, click the project name at the top of the Merchandising window to display the project dialog box, which contains all the project’s assets.
Assets that are out of date and need to be merged with the latest version appear at the top of the list and are marked with an icon.
Click the Actions menu and select Resolve Conflicts.
A progress bar appears at the bottom of the project. When the operation is finished, Merchandising displays a message that tells you how many conflicts were resolved and how many you must resolve manually.
For information about manually resolving version conflicts, see Resolving Conflicts with Other Projects.
(Optional) To cancel the operation, click the x icon that appears next to the progress bar.
