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
Explains both check-in and Get conflict types.
Describes the procedure used to resolve conflicts.