This documentation is archived and is not being maintained.
Workspace::ResolveConflict Method (Conflict, array<Conflict>%, array<String>, array<String>)
Visual Studio 2013
Attempts to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true.
If resolving this conflict caused other conflicts to be deleted besides the current conflict, then the list of other deleted conflicts will be returned in resolvedConflicts.
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, array<String^>^ itemAttributeFilters, array<String^>^ itemPropertyFilters )
Parameters
- conflict
- Type: Microsoft.TeamFoundation.VersionControl.Client::Conflict
the conflict to resolve
- resolvedConflicts
- Type: array<Microsoft.TeamFoundation.VersionControl.Client::Conflict>%
The other Conflicts that were deleted
- itemAttributeFilters
- Type: array<System::String>
A list of versioned item properties to return with each get operation
- itemPropertyFilters
- Type: array<System::String>
List of property filters.
- 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: