Export (0) Print
Expand All
Expand Minimize

MergeFlags Enumeration

The different ways to resolve a merge.

Used in tbl_PendingMerge.HowMerged and tbl_Merges.HowMerged.

This enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.

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

[FlagsAttribute]
public enum MergeFlags

Member nameDescription
AcceptMergedThe user chose to use the result of a non-automatic three way merge.

AcceptMineThe user chose to ignore any "theirs" changes.

AcceptTheirsThe user chose to ignore any local changes and accepted the changes from the "theirs" source.

AcceptYoursRenameTheirs

AddA merged add, or a branch operation. This is only for future transitive merge history.

DeleteConflict

DeletedA merged delete. This is only for future transitive merge history.

EditThe user edited the file after resolving the merge but before committing.

NoneThe merge has yet to be resolved.

TransitiveMergeRecordFor future use: transitive merge records should be always ignored.

Show:
© 2014 Microsoft