Specify AutoResolve Resolution Options
Conflicts can sometimes block you from completing get, checkin, merge, and rollback operations. You resolve these conflicts by using the Conflicts channel of the Pending Changes window. In this window, the AutoResolve All command can help you resolve many types of conflicts more quickly and easily. For more information, see Resolve Conflicts between Two Files.
In special cases, you may want to restrict the types of conflicts that AutoResolve automatically resolves for you. You can initiate an AutoResolve operation from the Conflicts channel of the Pending Changes window and select the Specific Content Types option.
The Choose Conflicts to Resolve dialog box appears. The following table can help you to decide which check boxes to select in order to achieve the result you want from an AutoResolve operation.
If you want AutoResolve to automatically resolve conflicts that occurred because… |
As explained in this example… |
Then select this check box… |
|---|---|---|
Non-conflicting content changes were made in each version of a file |
In the file version on the left, a zero was added at the beginning. In the file on the right, a three was added at the end: .png "Non-conflicting content changes") |
Conflicts with any content changes |
Content changes were made that are unique to the workspace (during get or checkin operation) or target version (during merge or rollback operation) |
four and five were added to the workspace or target version: .png "Content changes unique to workspace or target") |
Conflicts with content changes made only in the local workspace or target branch |
Content changes were made that are unique to the server (during get or checkin operation) or source version (during merge or rollback operation) |
four and five were added to the server or source version: .png "Content changes unique to server or source") |
Conflicts with content changes made only in the server version or source branch |
|
Changes to each version resulted in identical file content. The changes can be to the content in the files, as shown in the following example: .png "Identical content changes in each version")
This option also resolves conflicts that are caused by all other operations (for example, rename, delete, undelete, and branch) and that result in identical files. .gif "Tip") Tip
If you select this check box, when you proceed, the system will resolve these changes by taking (downloading) the server version onto your workspace.
|
Conflicts caused by identical change in the server and local workspace |
A file on the server (during get or checkin operation) or in the source branch (during merge or rollback operation) was renamed |
You checked out a file that is named launch.cs and worked on it. During that time, someone else checked in a changeset that affected the same file. That changeset did not modify the contents of the file, but it did change the name of the file to start.cs. |
Conflicts caused by renaming file in the server version or source branch |