WorkspaceManager_Cmd-ResolveOnlineConflictsResolveOnlineConflicts_AD

Applied Parameters: -

Summary

This command is used to remedy a conflict between the data for the local project and the data for the mirrored project in the Workspace.

Access

This command is accessed from the Projects panel by right-clicking on the project that shows an existing conflict, denoted by the Conflict icon (), then choosing Resolve Conflicts from the menu.

Use

After launching the command, the Resolve Conflicts dialog will open. You will have the option to Use Server files (the data from the mirrored project in the Workspace will be used and local modifications will be lost), or Use Local files (the data from the local project will be used and synced to overwrite the current data for the mirrored project in the Workspace).