com.microsoft.tfs.core.clients.versioncontrol.conflicts
Class ConflictCategory
java.lang.Object
com.microsoft.tfs.util.TypesafeEnum
com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictCategory
- All Implemented Interfaces:
- java.lang.Comparable
public class ConflictCategory
- extends com.microsoft.tfs.util.TypesafeEnum
A ConflictCategory
is a typed enumeration of known types of
conflicts. (The class name "ConflictType" was already taken.)
- Since:
- TEE-SDK-10.1
Methods inherited from class com.microsoft.tfs.util.TypesafeEnum |
compareTo, equals, getValue, hashCode, toString |
Methods inherited from class java.lang.Object |
clone, finalize, getClass, notify, notifyAll, wait, wait, wait |
UNKNOWN
public static final ConflictCategory UNKNOWN
VERSION
public static final ConflictCategory VERSION
MERGE
public static final ConflictCategory MERGE
SERVER_DELETED
public static final ConflictCategory SERVER_DELETED
MERGE_TARGET_DELETED
public static final ConflictCategory MERGE_TARGET_DELETED
LOCALLY_DELETED
public static final ConflictCategory LOCALLY_DELETED
MERGE_SOURCE_DELETED
public static final ConflictCategory MERGE_SOURCE_DELETED
BOTH_DELETED
public static final ConflictCategory BOTH_DELETED
MERGE_BOTH_DELETED
public static final ConflictCategory MERGE_BOTH_DELETED
FILENAME
public static final ConflictCategory FILENAME
WRITABLE
public static final ConflictCategory WRITABLE
SHELVESET
public static final ConflictCategory SHELVESET
ROLLBACK_LOCAL
public static final ConflictCategory ROLLBACK_LOCAL
ConflictCategory
protected ConflictCategory(int value)
getAllConflictCategories
public static ConflictCategory[] getAllConflictCategories()
getConflictCategory
public static ConflictCategory getConflictCategory(Conflict conflict)
- Given an AConflict, determines the type of conflict and returns the
appropriate ConflictCategory which describes this conflict.
- Parameters:
conflict
- the AConflict to determine the type of
- Returns:
- the appropriate ConflictCategory or null if the conflict type is
unknown
© 2015 Microsoft. All rights reserved.