Freigeben über


MergeChangeType Enumeration

An enumeration of the possible change types for a merge operation.

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

Syntax

'Declaration
Public Enumeration MergeChangeType
public enum MergeChangeType
public enum class MergeChangeType
type MergeChangeType
public enum MergeChangeType

Members

Member name Description
Both Content from the original sequence has changed in both the modified and the latest sequences. The changed content in the modified and latest sequences is identical and non-conflicting.

Conflict Content from the original sequence has changed in both the modified and the latest sequences. The changed content in the modified and latest sequences is conflicting.

Latest Content from the original sequence has changed in the latest sequence.

Modified Content from the original sequence has changed in the modified sequence.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Common Namespace