Performs a content merge based on the requested conflict.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in microsoft.teamfoundation.versioncontrol.client.dll)
Syntax
Visual Basic (Declaration)
Public Function MergeContent ( _
conflict As Conflict, _
useExternalMergeTool As Boolean _
) As Boolean
Dim instance As Workspace
Dim conflict As Conflict
Dim useExternalMergeTool As Boolean
Dim returnValue As Boolean
returnValue = instance.MergeContent(conflict, useExternalMergeTool)
public bool MergeContent (
Conflict conflict,
bool useExternalMergeTool
)
public:
bool MergeContent (
Conflict^ conflict,
bool useExternalMergeTool
)
public boolean MergeContent (
Conflict conflict,
boolean useExternalMergeTool
)
public function MergeContent (
conflict : Conflict,
useExternalMergeTool : boolean
) : boolean
Parameters
- conflict
Conflict for which to do a content merge.
- useExternalMergeTool
Whether to use a registered external merge tool.
Return Value
true if the merge was successful; otherwise
false.
See Also