com.microsoft.tfs.core.clients.versioncontrol.conflicts
Class ConflictDescriptionStrings

java.lang.Object
  extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescriptionStrings

public class ConflictDescriptionStrings
extends java.lang.Object

Since:
TEE-SDK-10.1

Field Summary
static java.lang.String AUTOMERGE
           
static java.lang.String AUTOMERGE_TOOLTIP
           
static java.lang.String BASELESS_MERGE_CONFLICT
           
static java.lang.String KEEP_LOCAL
           
static java.lang.String KEEP_LOCAL_TOOLTIP
           
static java.lang.String MERGE_ACCEPT_THEIRS
           
static java.lang.String MERGE_ACCEPT_THEIRS_TOOLTIP
           
static java.lang.String MERGE_ACCEPT_YOURS
           
static java.lang.String MERGE_ACCEPT_YOURS_TOOLTIP
           
static java.lang.String MERGE_TARGET_DELETED_AUTOMERGE
           
static java.lang.String MERGE_TARGET_DELETED_AUTOMERGE_TOOLTIP
           
static java.lang.String MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR
           
static java.lang.String MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR_TOOLTIP
           
static java.lang.String OVERWRITE
           
static java.lang.String OVERWRITE_TOOLTIP
           
static java.lang.String RENAME
           
static java.lang.String RENAME_AND_AUTOMERGE
           
static java.lang.String RENAME_AND_AUTOMERGE_TOOLTIP
           
static java.lang.String RENAME_ENCODING_AND_AUTOMERGE
           
static java.lang.String RENAME_ENCODING_AND_AUTOMERGE_TOOLTIP
           
static java.lang.String RENAME_TOOLTIP
           
static java.lang.String ROLLBACK_LOCAL_ACCEPT_THEIRS
           
static java.lang.String ROLLBACK_LOCAL_ACCEPT_THEIRS_TOOLTIP
           
static java.lang.String ROLLBACK_LOCAL_ACCEPT_YOURS
           
static java.lang.String ROLLBACK_LOCAL_ACCEPT_YOURS_TOOLTIP
           
static java.lang.String SELECT_ENCODING_AND_AUTOMERGE
           
static java.lang.String SELECT_ENCODING_AND_AUTOMERGE_TOOLTIP
           
static java.lang.String SUMMARY_BINARY
           
static java.lang.String SUMMARY_BOTH_CHANGED
           
static java.lang.String SUMMARY_CONTENT_AND_ENCODING_CHANGED
           
static java.lang.String SUMMARY_CONTENT_CONFLICT
           
static java.lang.String SUMMARY_NO_MERGE_AVAILABLE
           
static java.lang.String SUMMARY_RENAMED
           
static java.lang.String SUMMARY_UNMERGEABLE
           
static java.lang.String VERSION_ACCEPT_THEIRS
           
static java.lang.String VERSION_ACCEPT_THEIRS_TOOLTIP
           
static java.lang.String VERSION_ACCEPT_YOURS
           
static java.lang.String VERSION_ACCEPT_YOURS_TOOLTIP
           
static java.lang.String VERSION_DELETED_ACCEPT_YOURS
           
static java.lang.String VERSION_DELETED_ACCEPT_YOURS_TOOLTIP
           
static java.lang.String VERSION_RENAME_LOCAL
           
static java.lang.String VERSION_RENAME_LOCAL_TOOLTIP
           
static java.lang.String VERSION_RENAME_SERVER
           
static java.lang.String VERSION_RENAME_SERVER_TOOLTIP
           
static java.lang.String WRITABLE_AUTOMERGE
           
static java.lang.String WRITABLE_AUTOMERGE_TOOLTIP
           
 
Method Summary
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Field Detail

VERSION_ACCEPT_THEIRS

public static final java.lang.String VERSION_ACCEPT_THEIRS

VERSION_ACCEPT_THEIRS_TOOLTIP

public static final java.lang.String VERSION_ACCEPT_THEIRS_TOOLTIP

VERSION_ACCEPT_YOURS

public static final java.lang.String VERSION_ACCEPT_YOURS

VERSION_ACCEPT_YOURS_TOOLTIP

public static final java.lang.String VERSION_ACCEPT_YOURS_TOOLTIP

ROLLBACK_LOCAL_ACCEPT_THEIRS

public static final java.lang.String ROLLBACK_LOCAL_ACCEPT_THEIRS

ROLLBACK_LOCAL_ACCEPT_THEIRS_TOOLTIP

public static final java.lang.String ROLLBACK_LOCAL_ACCEPT_THEIRS_TOOLTIP

ROLLBACK_LOCAL_ACCEPT_YOURS

public static final java.lang.String ROLLBACK_LOCAL_ACCEPT_YOURS

ROLLBACK_LOCAL_ACCEPT_YOURS_TOOLTIP

public static final java.lang.String ROLLBACK_LOCAL_ACCEPT_YOURS_TOOLTIP

MERGE_ACCEPT_THEIRS

public static final java.lang.String MERGE_ACCEPT_THEIRS

MERGE_ACCEPT_THEIRS_TOOLTIP

public static final java.lang.String MERGE_ACCEPT_THEIRS_TOOLTIP

MERGE_ACCEPT_YOURS

public static final java.lang.String MERGE_ACCEPT_YOURS

MERGE_ACCEPT_YOURS_TOOLTIP

public static final java.lang.String MERGE_ACCEPT_YOURS_TOOLTIP

VERSION_RENAME_SERVER

public static final java.lang.String VERSION_RENAME_SERVER

VERSION_RENAME_SERVER_TOOLTIP

public static final java.lang.String VERSION_RENAME_SERVER_TOOLTIP

VERSION_RENAME_LOCAL

public static final java.lang.String VERSION_RENAME_LOCAL

VERSION_RENAME_LOCAL_TOOLTIP

public static final java.lang.String VERSION_RENAME_LOCAL_TOOLTIP

AUTOMERGE

public static final java.lang.String AUTOMERGE

AUTOMERGE_TOOLTIP

public static final java.lang.String AUTOMERGE_TOOLTIP

RENAME_AND_AUTOMERGE

public static final java.lang.String RENAME_AND_AUTOMERGE

RENAME_AND_AUTOMERGE_TOOLTIP

public static final java.lang.String RENAME_AND_AUTOMERGE_TOOLTIP

RENAME_ENCODING_AND_AUTOMERGE

public static final java.lang.String RENAME_ENCODING_AND_AUTOMERGE

RENAME_ENCODING_AND_AUTOMERGE_TOOLTIP

public static final java.lang.String RENAME_ENCODING_AND_AUTOMERGE_TOOLTIP

RENAME

public static final java.lang.String RENAME

RENAME_TOOLTIP

public static final java.lang.String RENAME_TOOLTIP

SELECT_ENCODING_AND_AUTOMERGE

public static final java.lang.String SELECT_ENCODING_AND_AUTOMERGE

SELECT_ENCODING_AND_AUTOMERGE_TOOLTIP

public static final java.lang.String SELECT_ENCODING_AND_AUTOMERGE_TOOLTIP

WRITABLE_AUTOMERGE

public static final java.lang.String WRITABLE_AUTOMERGE

WRITABLE_AUTOMERGE_TOOLTIP

public static final java.lang.String WRITABLE_AUTOMERGE_TOOLTIP

OVERWRITE

public static final java.lang.String OVERWRITE

OVERWRITE_TOOLTIP

public static final java.lang.String OVERWRITE_TOOLTIP

KEEP_LOCAL

public static final java.lang.String KEEP_LOCAL

KEEP_LOCAL_TOOLTIP

public static final java.lang.String KEEP_LOCAL_TOOLTIP

MERGE_TARGET_DELETED_AUTOMERGE

public static final java.lang.String MERGE_TARGET_DELETED_AUTOMERGE

MERGE_TARGET_DELETED_AUTOMERGE_TOOLTIP

public static final java.lang.String MERGE_TARGET_DELETED_AUTOMERGE_TOOLTIP

MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR

public static final java.lang.String MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR

MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR_TOOLTIP

public static final java.lang.String MERGE_TARGET_DELETED_MERGE_IN_EXTERNAL_EDITOR_TOOLTIP

VERSION_DELETED_ACCEPT_YOURS

public static final java.lang.String VERSION_DELETED_ACCEPT_YOURS

VERSION_DELETED_ACCEPT_YOURS_TOOLTIP

public static final java.lang.String VERSION_DELETED_ACCEPT_YOURS_TOOLTIP

SUMMARY_BOTH_CHANGED

public static final java.lang.String SUMMARY_BOTH_CHANGED

BASELESS_MERGE_CONFLICT

public static final java.lang.String BASELESS_MERGE_CONFLICT

SUMMARY_CONTENT_CONFLICT

public static final java.lang.String SUMMARY_CONTENT_CONFLICT

SUMMARY_CONTENT_AND_ENCODING_CHANGED

public static final java.lang.String SUMMARY_CONTENT_AND_ENCODING_CHANGED

SUMMARY_RENAMED

public static final java.lang.String SUMMARY_RENAMED

SUMMARY_BINARY

public static final java.lang.String SUMMARY_BINARY

SUMMARY_NO_MERGE_AVAILABLE

public static final java.lang.String SUMMARY_NO_MERGE_AVAILABLE

SUMMARY_UNMERGEABLE

public static final java.lang.String SUMMARY_UNMERGEABLE


© 2015 Microsoft. All rights reserved.