Compartilhar via


Workspace.MergeContent Method

Performs a content merge that is based on the requested conflict.

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

Syntax

'Declaração
Public Function MergeContent ( _
    conflict As Conflict, _
    useExternalMergeTool As Boolean _
) As Boolean
public bool MergeContent(
    Conflict conflict,
    bool useExternalMergeTool
)
public:
bool MergeContent(
    Conflict^ conflict, 
    bool useExternalMergeTool
)
member MergeContent : 
        conflict:Conflict * 
        useExternalMergeTool:bool -> bool 
public function MergeContent(
    conflict : Conflict, 
    useExternalMergeTool : boolean
) : boolean

Parameters

  • useExternalMergeTool
    Type: System.Boolean
    True to use a registered external merge tool. False to not use.

Return Value

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

.NET Framework Security

See Also

Reference

Workspace Class

Microsoft.TeamFoundation.VersionControl.Client Namespace