Export (0) Print
Expand All
Expand Minimize

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)

public enum MergeChangeType

Member nameDescription
BothContent 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.

ConflictContent 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.

LatestContent from the original sequence has changed in the latest sequence.

ModifiedContent from the original sequence has changed in the modified sequence.

Show:
© 2014 Microsoft