com.microsoft.tfs.core.clients.versioncontrol.soapextensions
Class ConflictOptions

java.lang.Object
  extended by com.microsoft.tfs.util.BitField
      extended by com.microsoft.tfs.core.clients.versioncontrol.soapextensions.ConflictOptions
All Implemented Interfaces:
java.io.Serializable

public class ConflictOptions
extends com.microsoft.tfs.util.BitField

See Also:
Serialized Form

Field Summary
static ConflictOptions DISALLOW_AUTO_MERGE
          Informs the client that it should disallow auto-merge.
static ConflictOptions LOCAL_CHANGES_REDUNDANT_IN_TARGET_VERSION
          Current only used for version conflicts.
static ConflictOptions NONE
           
static ConflictOptions PENDING_LOCAL_VERSION_MISMATCH
          Indicates that this conflict is due to a local / pending version mismatch.
 
Method Summary
 boolean contains(ConflictOptions disallowAutoMerge)
           
static ConflictOptions fromIntFlags(int flags)
           
 
Methods inherited from class com.microsoft.tfs.util.BitField
combine, combineInternal, containsAllInternal, containsAnyInternal, containsInternal, equals, fromStringValues, getCombinedSpecialFlags, hashCode, isEmpty, registerStringValue, registerStringValue, removeInternal, retainInternal, toFullStringValues, toIntFlags, toString, toStringValues
 
Methods inherited from class java.lang.Object
clone, finalize, getClass, notify, notifyAll, wait, wait, wait
 

Field Detail

NONE

public static final ConflictOptions NONE

DISALLOW_AUTO_MERGE

public static final ConflictOptions DISALLOW_AUTO_MERGE
Informs the client that it should disallow auto-merge.


PENDING_LOCAL_VERSION_MISMATCH

public static final ConflictOptions PENDING_LOCAL_VERSION_MISMATCH
Indicates that this conflict is due to a local / pending version mismatch.


LOCAL_CHANGES_REDUNDANT_IN_TARGET_VERSION

public static final ConflictOptions LOCAL_CHANGES_REDUNDANT_IN_TARGET_VERSION
Current only used for version conflicts. This is set if the local pending cahnges are redundant (cannot apply) to the version being moved to.

Method Detail

contains

public boolean contains(ConflictOptions disallowAutoMerge)

fromIntFlags

public static ConflictOptions fromIntFlags(int flags)


© 2015 Microsoft. All rights reserved.