Partilhar via


Workspace.ResolveConflict Method

Include Protected Members
Include Inherited Members

This member is overloaded. For complete information about this member, including syntax, usage, and examples, click a name in the overload list.

Overload List

  Name Description
Public method ResolveConflict(Conflict) Attempt to resolve a conflict according to the conflict's Resolution property.
Public method ResolveConflict(Conflict, array<Conflict[]%) Attempt to resolve a conflict according to the conflict's Resolution property.
Public method ResolveConflict(Conflict, array<Conflict[]%, array<String[]) Attempt to resolve a conflict according to the conflict's Resolution property.

Top

See Also

Reference

Workspace Class

Microsoft.TeamFoundation.VersionControl.Client Namespace