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.
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
|The user chose to use the result of a non-automatic three way merge.|
|The user chose to ignore any "theirs" changes.|
|The user chose to ignore any local changes and accepted the changes from the "theirs" source.|
|A merged add, or a branch operation. This is only for future transitive merge history.|
|A merged delete. This is only for future transitive merge history.|
|The user edited the file after resolving the merge but before committing.|
|The merge has yet to be resolved.|
|For future use: transitive merge records should be always ignored.|