How to: Resolve Conflicts in System Definition Model (SDM) Documents
In Distributed System Designers, you might need to resolve conflicts in SDM documents when you check project files into source code control after checking them out concurrently. The following guidelines apply when resolving conflicts in SDM documents:
Prior to resolving conflicts, close all designers.
Resolve conflicts in any application definition (.sdm) files before resolving conflicts in any distributed system diagram (.ad, .sd, .dd, or .ldd) files.
If you need to resolve conflicts in .sdm files, first choose to merge them automatically. If conflicts still exist, then choose to merge them manually.
If you need to resolve conflicts in distributed system diagram files, do not merge these files as these files should not be merged and most of the information they contain will be reverse-engineered. Instead, choose to keep the server version or local version of these files. For more information, see Concurrent Checkout and Changes to System Definition Model (SDM) Documents.
After resolving conflicts, open the appropriate diagrams to ensure that conflicts have been properly resolved and to fix any issues on those diagrams.
For more information resolving conflicts using Team Foundation, see How to: Resolve Conflicts Between Two Files.
To resolve conflicts in application definition (.sdm) files
When the Resolve Version Conflict dialog box appears, choose Automatic merge.
If conflicts between these files still exist, the Resolve Conflicts dialog box appears.
In the Resolve Conflicts dialog box, select the files that you want and click Resolve.
The Resolve Version Conflict dialog box appears.
In the Resolve Version Conflict dialog box, choose Manual merge to manually merge the files.
To resolve conflicts in distributed system diagram (.ad, .sd, .dd, or .ldd) files
When the Resolve Version Conflict dialog box appears, click Resolve.
Warning
Do not choose to merge these files.
The Resolve Version Conflict dialog box appears.
In the Resolve Version Conflict dialog box, choose one of the following:
Keep server changes to keep the server version of the file.
Keep local changes to keep the local version of the file.