ThreeWayMerge.Run Method (array<IMergeChange %, Boolean, Boolean, Boolean, Boolean)

Executes a three-way merge.

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

Syntax

'Declaration
Public Function Run ( _
    <OutAttribute> ByRef mergeList As IMergeChange(), _
    writeOriginalForConflictingRange As Boolean, _
    ignoreLeadingAndTrailingWhiteSpace As Boolean, _
    ignoreEndOfLineDifferences As Boolean, _
    ignoreEndOfFileEndOfLineDifference As Boolean _
) As Boolean

public bool Run(
    out IMergeChange[] mergeList,
    bool writeOriginalForConflictingRange,
    bool ignoreLeadingAndTrailingWhiteSpace,
    bool ignoreEndOfLineDifferences,
    bool ignoreEndOfFileEndOfLineDifference
)

public:
bool Run(
    [OutAttribute] array<IMergeChange^>^% mergeList, 
    bool writeOriginalForConflictingRange, 
    bool ignoreLeadingAndTrailingWhiteSpace, 
    bool ignoreEndOfLineDifferences, 
    bool ignoreEndOfFileEndOfLineDifference
)

member Run : 
        mergeList:IMergeChange[] byref * 
        writeOriginalForConflictingRange:bool * 
        ignoreLeadingAndTrailingWhiteSpace:bool * 
        ignoreEndOfLineDifferences:bool * 
        ignoreEndOfFileEndOfLineDifference:bool -> bool

public function Run(
    mergeList : IMergeChange[], 
    writeOriginalForConflictingRange : boolean, 
    ignoreLeadingAndTrailingWhiteSpace : boolean, 
    ignoreEndOfLineDifferences : boolean, 
    ignoreEndOfFileEndOfLineDifference : boolean
) : boolean

Parameters

• mergeList
  Type: array<Microsoft.TeamFoundation.VersionControl.Common.IMergeChange[]%

  The information about a specific change in a merge operation.

• writeOriginalForConflictingRange
  Type: System.Boolean

  true to write original for conflicting range; otherwise, false.

• ignoreLeadingAndTrailingWhiteSpace
  Type: System.Boolean

  true to ignore leading and trailing white space; otherwise, false.

• ignoreEndOfLineDifferences
  Type: System.Boolean

  true to ignore end of line difference; otherwise, false.

• ignoreEndOfFileEndOfLineDifference
  Type: System.Boolean

  true to ignore end of file and end of line difference; otherwise, false.

Return Value

Type: System.Boolean
true if the three-way merge successfully completed; otherwise, false.

.NET Framework Security

• Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.

See Also

Reference

ThreeWayMerge Class

Run Overload

Microsoft.TeamFoundation.VersionControl.Client Namespace