com.microsoft.tfs.core.clients.versioncontrol
Class AutoResolveOptions

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

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

Specifies which conflicts will be resolved as automerge.

See Also:
Serialized Form
Thread-safety:
unknown

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

NONE

public static final AutoResolveOptions NONE
Do nothing.


ONLY_LOCAL_TARGET

public static final AutoResolveOptions ONLY_LOCAL_TARGET
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalLatest = 0 will be resolved.


ONLY_SERVER_SOURCE

public static final AutoResolveOptions ONLY_SERVER_SOURCE
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalModified = 0 will be resolved.


BOTH_LOCAL_TARGET_AND_SERVER_SOURCE

public static final AutoResolveOptions BOTH_LOCAL_TARGET_AND_SERVER_SOURCE
All conflicts with ChangeSummary.TotalConflict = 0 will be resolved.


INCOMING_RENAME

public static final AutoResolveOptions INCOMING_RENAME
Conflicts that include source/server rename, but not local/target rename will be resolved.


REDUNDANT

public static final 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. Content is compared for Edit and Branch changes.


SILENT

public static final AutoResolveOptions SILENT
Conflicts that require name or encoding parameters are not reported to the user.


ALL_CONTENT

public static final AutoResolveOptions ALL_CONTENT
All conflicts will be resolved and conflict that require name or encoding will be reported to the user.


ALL

public static final AutoResolveOptions ALL
All content and redundant conflicts will be resolved.


ALL_SILENT

public static final AutoResolveOptions ALL_SILENT
All content and redundant conflicts will be resolved. Conflicts that require name or encoding will be ignored.

Method Detail

contains

public boolean contains(AutoResolveOptions other)


© 2015 Microsoft. All rights reserved.