This documentation is archived and is not being maintained.

Resolving Conflicts (Team Foundation Source Control)

This section contains topics that describe how to solve conflicts that occur during a merge, during check-in, and when you use Get from Team Foundation source control.

In This Section

Understanding Conflict Types

Explains both check-in and Get conflict types.

How to: Resolve Conflicts

Describes the procedure used to resolve conflicts.

Reference

Related Sections

Branching and Merging Team Foundation Source Control

Provides information on branching and merging team projects.

Comparing Files in Source Control

Explains how to compare, or diff, files, folders, and shelvesets.

Team Foundation Source Control Walkthroughs

Lists walkthroughs that explore how to use source control, customize a source control check-in, and use source control from the command line.

See Also

Show: