|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.util.BitField
com.microsoft.tfs.core.clients.versioncontrol.soapextensions.ConflictOptions
public class ConflictOptions
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 |
---|
public static final ConflictOptions NONE
public static final ConflictOptions DISALLOW_AUTO_MERGE
public static final ConflictOptions PENDING_LOCAL_VERSION_MISMATCH
public static final ConflictOptions LOCAL_CHANGES_REDUNDANT_IN_TARGET_VERSION
Method Detail |
---|
public boolean contains(ConflictOptions disallowAutoMerge)
public static ConflictOptions fromIntFlags(int flags)
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |