This documentation is archived and is not being maintained.
Workspace::ResolveConflict Method (Conflict, array<Conflict>%)
Visual Studio 2013
Attempt to resolve a conflict based on its Resolution property.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
public: void ResolveConflict( Conflict^ conflict, [OutAttribute] array<Conflict^>^% resolvedConflicts )
Parameters
- conflict
- Type: Microsoft.TeamFoundation.VersionControl.Client::Conflict
The conflict to resolve.
- resolvedConflicts
- Type: array<Microsoft.TeamFoundation.VersionControl.Client::Conflict>%
The array of conflicts that were deleted.
- 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.
Show: