Export (0) Print
Expand All
Expand Minimize

Workspace.MergeContent Method

Merges content based on the requested conflict.

Namespace:  Microsoft.TeamFoundation.VersionControl.Client
Assembly:  Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)

public bool MergeContent(
	Conflict conflict,
	bool useExternalMergeTool
)

Parameters

conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict

Conflict for which to merge content.

useExternalMergeTool
Type: System.Boolean

True to use a registered external merge tool; otherwise, false.

Return Value

Type: System.Boolean
True if the merge was successful; otherwise, false.

Show:
© 2014 Microsoft