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)

Tries to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true.

Public method

ResolveConflict(Conflict, array<Conflict[]%)

Tries to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true.

Top

See Also

Reference

Workspace Class

Workspace Members

Microsoft.TeamFoundation.VersionControl.Client Namespace