Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
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.
- Understanding Conflict Types
Explains both check-in and Get conflict types.
- How to: Resolve Conflicts
Describes the procedure used to resolve conflicts.
Team Foundation Source Control Command-Line Reference
- 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.