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.

In This Section

• 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.

Reference

Team Foundation Version Control Command-Line Reference

Related Sections

• 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.