This documentation is archived and is not being maintained.
Resolution Enumeration
Visual Studio 2013
These are the different ways to resolve a conflict.
Namespace: Microsoft.TeamFoundation.VersionControl.Server
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
Show: