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.
Describes how to reconcile the differences between a server folder and local folder, and how to resolve conflicting pending changes in your local folder.
Describes how to resolve file conflicts.
Describes how to control the way AutoMerge operation resolves conflicts.
Team Foundation Version Control Command-Line Reference
Provides information about branching and merging team projects.
Describes how to compare two server folders, two local folders, or a server folder and a local folder.
Describes how to view the differences between two server files, two local files, or a server file and a local file.