Workspace.AutoResolveValidConflicts Method
Visual Studio 2012
Automatically resolves the conflict within the workspace using the available auto resolve options.
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
public void AutoResolveValidConflicts( IEnumerable<Conflict> conflicts, AutoResolveOptions resolveOptions )
Parameters
- conflicts
- Type: IEnumerable<Conflict>
The enumerated conflicts.
- resolveOptions
- Type: Microsoft.TeamFoundation.VersionControl.Client.AutoResolveOptions
The resolve options.
- Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.
