次の方法で共有


Workspace.ResolveConflicts Method

Include Protected Members
Include Inherited Members

Attempts to resolve a conflicts.

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 ResolveConflicts(IEnumerable<Conflict>, array<String[], array<Conflict[]%) 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 these conflicts caused other conflicts to be deleted besides the current conflicts, then the list of other deleted conflicts will be returned in resolvedConflicts. Note: For this method, all resolution options for the conflicts must be the same.
Public method ResolveConflicts(IEnumerable<Conflict>, array<String[], array<String[], array<Conflict[]%) 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 these conflicts caused other conflicts to be deleted besides the current conflicts, then the list of other deleted conflicts will be returned in resolvedConflicts. Note: For this method, all resolution options for the conflicts must be the same.

Top

See Also

Reference

Workspace Class

Microsoft.TeamFoundation.VersionControl.Client Namespace