This documentation is archived and is not being maintained.

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)

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

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.

Show: