Share via


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)

Syntax

'Declaration
<FlagsAttribute> _
Public Enumeration MergeFlags
[FlagsAttribute]
public enum MergeFlags
[FlagsAttribute]
public enum class MergeFlags
[<FlagsAttribute>]
type MergeFlags
public enum MergeFlags

Members

Member name Description
AcceptMerged The user chose to use the result of a non-automatic three way merge.

AcceptMine The user chose to ignore any "theirs" changes.

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

AcceptYoursRenameTheirs

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

DeleteConflict

Deleted A merged delete. This is only for future transitive merge history.

Edit The user edited the file after resolving the merge but before committing.

None The merge has yet to be resolved.

TransitiveMergeRecord For future use: transitive merge records should be always ignored.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Server Namespace