ThreeWayMerge Class

Contains the methods to perform a three-way merge.

System.Object
  Microsoft.TeamFoundation.VersionControl.Client.ThreeWayMerge

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

public class ThreeWayMerge

The ThreeWayMerge type exposes the following members.

  NameDescription
Public methodThreeWayMergeInitializes a new ThreeWayMerge instance.
Top

  NameDescription
Public propertyContentMergeSummaryGets the content merge summary.
Public propertyIntermediateMergeEncodingGets or sets the intermediate merge encoding.
Public propertyIsBaselessGets or sets a flag that describes whether the merge is baseless.
Public propertyLatestFileEncodingGets or sets the latest file encoding.
Public propertyLatestFileLabelGets or sets the latest file label.
Public propertyLatestFileLabelFileGets or sets the latest label file label.
Public propertyLatestFileLabelTagGets or sets the latest label file tag.
Public propertyLatestFileNameGets or sets the latest file name.
Public propertyLatestFileSpecThe file spec of the latest file
Public propertyMergedFileEncodingGets or sets the merged file encoding.
Public propertyMergedFileLabelGets or sets the merged file label.
Public propertyMergedFileLabelFileGets or sets the merged file label file.
Public propertyMergedFileLabelTagGets or sets the merged file label tag.
Public propertyMergedFileNameGets or sets the merged file name.
Public propertyModifiedFileEncodingGets or sets the modified file encoding.
Public propertyModifiedFileLabelGets or sets the modified file label.
Public propertyModifiedFileLabelFileGets or sets the modified file label file.
Public propertyModifiedFileLabelTagGets or sets the modified file label tag.
Public propertyModifiedFileNameGets or sets the modified file name.
Public propertyModifiedFileSpecThe file spec of the modified file
Public propertyOriginalFileEncodingGets or sets the original file encoding.
Public propertyOriginalFileLabelGets or sets the original file label.
Public propertyOriginalFileLabelFileGets or sets the original file label file.
Public propertyOriginalFileLabelTagGets or sets the original file label tag.
Public propertyOriginalFileNameGets or sets the original file name.
Public propertyPreferredMergedFileEncodingGets or sets the preferred merged file encoding.
Public propertyUseExternalAutomergeToolGets or sets whether the merge uses an external automerge tool.
Public propertyUseExternalMergeToolGets or sets a flag that describes whether to use an external merge tool.
Public propertyVersionControlServerGuidThe version control server guid
Top

  NameDescription
Public methodEqualsDetermines whether the specified object is equal to the current object. (Inherited from Object.)
Protected methodFinalizeAllows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.)
Public methodGetHashCodeServes as the default hash function. (Inherited from Object.)
Public methodGetTypeGets the Type of the current instance. (Inherited from Object.)
Protected methodMemberwiseCloneCreates a shallow copy of the current Object. (Inherited from Object.)
Public methodRun()Executes a three-way merge.
Public methodRun(IMergeChange[], Boolean, Boolean, Boolean, Boolean)Executes a three-way merge.
Public methodToStringReturns a string that represents the current object. (Inherited from Object.)
Top

Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.
Was this page helpful?
(1500 characters remaining)
Thank you for your feedback
Show:
© 2015 Microsoft