Resolve a Conflict in Design Models

Resolve inconsistencies between a model in your job site design and models for the same design on assigned controllers by choosing which model to use for all. A conflict is indicated by the active Resolve button with the icon in the Job Site Design Manager command pane. Causes of a model conflict include differences in model names, dates, or data.

Note: If the Edit button in the Model group has an icon on it as well, the conflict should be resolved by changing the model type in the Edit Job Site Design Model dialog. To reach the dialog, click No when you are asked if you want to resolve the conflict. Then change the model type to be compatible with the types of controllers to which the design is assigned. This may resolve all of the design model conflicts.
Note: Configuration (.cfg) files do not appear in the conflict resolution dialog, even if the only conflict is between them.
Note: The Undo and Redo commands do not affect any of the functions that synchronize files. Undo and Redo affect only edits made to database objects within your project; this does not include files in the data synchronization area (which SCS and GCS use). If you try to undo a conflict resolution, the Resolve button remains disabled because the conflict is still resolved.

To resolve a model conflict:

Click Resolve in the Job Site Design Manager.
Click Yes if asked if you want to resolve conflicts by using the project-based model. Otherwise, click No to display the Resolve Model Conflict dialog, showing the model in your project and all .ttm files on the controllers to which the design is assigned.
Select either the project-based or a controller-based model in the list.
Warning: Resolving a conflict by selecting the project-based model overwrites the model on assigned controllers when they are synchronized.
Click OK. The conflict is resolved, and the model is updated in your project or the data synchronization area, depending on your choice.