|
||||||||||
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.AutoResolveOptions
public class AutoResolveOptions
Specifies which conflicts will be resolved as automerge.
Field Summary | |
---|---|
static AutoResolveOptions |
ALL
All content and redundant conflicts will be resolved. |
static AutoResolveOptions |
ALL_CONTENT
All conflicts will be resolved and conflict that require name or encoding will be reported to the user. |
static AutoResolveOptions |
ALL_SILENT
All content and redundant conflicts will be resolved. |
static AutoResolveOptions |
BOTH_LOCAL_TARGET_AND_SERVER_SOURCE
All conflicts with ChangeSummary.TotalConflict = 0 will be resolved. |
static AutoResolveOptions |
INCOMING_RENAME
Conflicts that include source/server rename, but not local/target rename will be resolved. |
static AutoResolveOptions |
NONE
Do nothing. |
static AutoResolveOptions |
ONLY_LOCAL_TARGET
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalLatest = 0 will be resolved. |
static AutoResolveOptions |
ONLY_SERVER_SOURCE
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalModified = 0 will be resolved. |
static AutoResolveOptions |
REDUNDANT
Behavior intended for Gated Checkin: - Only version Get/Checkin - If Your and Their change is identical, content, encoding and path are identical resolves conflicts as TakeTheirs. |
static AutoResolveOptions |
SILENT
Conflicts that require name or encoding parameters are not reported to the user. |
Method Summary | |
---|---|
boolean |
contains(AutoResolveOptions other)
|
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 AutoResolveOptions NONE
public static final AutoResolveOptions ONLY_LOCAL_TARGET
public static final AutoResolveOptions ONLY_SERVER_SOURCE
public static final AutoResolveOptions BOTH_LOCAL_TARGET_AND_SERVER_SOURCE
public static final AutoResolveOptions INCOMING_RENAME
public static final AutoResolveOptions REDUNDANT
public static final AutoResolveOptions SILENT
public static final AutoResolveOptions ALL_CONTENT
public static final AutoResolveOptions ALL
public static final AutoResolveOptions ALL_SILENT
Method Detail |
---|
public boolean contains(AutoResolveOptions other)
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |