MergeOptionsEx Enumeration

The complete set of merge options, this is converted to an int and sent to the server so we can be backward compatible in future versions

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

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

Syntax

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

Members

Member name Description
AlwaysAcceptMine Instructs the server to discard any changes from the source, keeping only changes from the target.

Baseless Instructs the server to perform a baseless merge between items

Conservative Instructs the server to be conservative when declaring merges as conflicts. Available from TFS 2010.

ForceMerge Instructs the server to re-merge source versions which have been previously merged

NoAutoResolve Used only on the client. Instructs the client not to try to auto resolve conflicts

NoImplicitBaseless Only works prior on TFS 2008, instructs the server not to implicitly baseless merge items with the same relative path from the source root and target root. e.g. $/proj/trunk -> $/proj/branch If a new file is added at $/proj/trunk/a.cs and $/proj/branch/a.cs Setting this option will tell the server not to try to merge the 2 files

NoMerge Instructs the server not to actually pend the merge, but just return a preview of what must be merged

None No option

Silent Instructs the server to suppress any get operations and conflicts.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Common Namespace