Kommentar
Åtkomst till den här sidan kräver auktorisering. Du kan prova att logga in eller ändra kataloger.
Åtkomst till den här sidan kräver auktorisering. Du kan prova att ändra kataloger.
Contains options the server wants to communicate to the client about the conflict
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 ConflictOptions
[FlagsAttribute]
public enum ConflictOptions
[FlagsAttribute]
public enum class ConflictOptions
[<FlagsAttribute>]
type ConflictOptions
public enum ConflictOptions
Members
| Member name | Description | |
|---|---|---|
| DisallowAutoMerge | This option informs the client, that it should disallow auto-merge. | |
| LocalChangesRedundantInTargetVersion | Currently only used for version conflicts. This bit is set if the local pending changes are redundant (cannot apply) to the version being moved to. | |
| None | ||
| PendingLocalVersionMismatch | Indicates that this conflict is due to a local / pending version mismatch. |