ThreeWayMerge Class

Contains the methods to perform a three-way merge.

Inheritance Hierarchy

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

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

Syntax

'Declaration
Public Class ThreeWayMerge
public class ThreeWayMerge
public ref class ThreeWayMerge
type ThreeWayMerge =  class end
public class ThreeWayMerge

The ThreeWayMerge type exposes the following members.

Constructors

  Name Description
Public method ThreeWayMerge Initializes a new ThreeWayMerge instance.

Top

Properties

  Name Description
Public property ContentMergeSummary Gets the content merge summary.
Public property IntermediateMergeEncoding Gets or sets the intermediate merge encoding.
Public property IsBaseless Gets or sets a flag that describes whether the merge is baseless.
Public property LatestFileEncoding Gets or sets the latest file encoding.
Public property LatestFileLabel Gets or sets the latest file label.
Public property LatestFileLabelFile Gets or sets the latest label file label.
Public property LatestFileLabelTag Gets or sets the latest label file tag.
Public property LatestFileName Gets or sets the latest file name.
Public property LatestFileSpec The file spec of the latest file
Public property MergedFileEncoding Gets or sets the merged file encoding.
Public property MergedFileLabel Gets or sets the merged file label.
Public property MergedFileLabelFile Gets or sets the merged file label file.
Public property MergedFileLabelTag Gets or sets the merged file label tag.
Public property MergedFileName Gets or sets the merged file name.
Public property ModifiedFileEncoding Gets or sets the modified file encoding.
Public property ModifiedFileLabel Gets or sets the modified file label.
Public property ModifiedFileLabelFile Gets or sets the modified file label file.
Public property ModifiedFileLabelTag Gets or sets the modified file label tag.
Public property ModifiedFileName Gets or sets the modified file name.
Public property ModifiedFileSpec The file spec of the modified file
Public property OriginalFileEncoding Gets or sets the original file encoding.
Public property OriginalFileLabel Gets or sets the original file label.
Public property OriginalFileLabelFile Gets or sets the original file label file.
Public property OriginalFileLabelTag Gets or sets the original file label tag.
Public property OriginalFileName Gets or sets the original file name.
Public property PreferredMergedFileEncoding Gets or sets the preferred merged file encoding.
Public property UseExternalAutomergeTool Gets or sets whether the merge uses an external automerge tool.
Public property UseExternalMergeTool Gets or sets a flag that describes whether to use an external merge tool.
Public property VersionControlServerGuid The version control server guid

Top

Methods

  Name Description
Public method Equals Determines whether the specified object is equal to the current object. (Inherited from Object.)
Protected method Finalize Allows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.)
Public method GetHashCode Serves as a hash function for a particular type. (Inherited from Object.)
Public method GetType Gets the Type of the current instance. (Inherited from Object.)
Protected method MemberwiseClone Creates a shallow copy of the current Object. (Inherited from Object.)
Public method Run() Executes a three-way merge.
Public method Run(array<IMergeChange[]%, Boolean, Boolean, Boolean, Boolean) Executes a three-way merge.
Public method ToString Returns a string that represents the current object. (Inherited from Object.)

Top

Thread Safety

Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace