The topic you requested is included in another documentation set. For convenience, it's displayed below. Choose Switch to see the topic in its original location.

Resolving Folder Differences and File Conflicts

The following section contains topics that describe how to solve the conflicts that can occur between server versions of folders and files and versions that have pending changes in your local workspace.

Reconcile Differences Between Two Folders

Describes how to reconcile the differences between a server folder and local folder, and how to resolve conflicting pending changes in your local folder.

Resolve Conflicts between Two Files

Describes how to resolve file conflicts.

Specify AutoResolve Resolution Options

Describes how to control the way AutoMerge operation resolves conflicts.

Branching and Merging

Provides information about branching and merging team projects.

Compare Two Folders

Describes how to compare two server folders, two local folders, or a server folder and a local folder.

Compare Two Files

Describes how to view the differences between two server files, two local files, or a server file and a local file.

Was this page helpful?
(1500 characters remaining)
Thank you for your feedback

Community Additions

© 2014 Microsoft