|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Uses of ConflictResolutionOptions in com.microsoft.tfs.core.clients.versioncontrol.conflicts |
|---|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts with parameters of type ConflictResolutionOptions | |
|---|---|
protected java.util.Collection<ConflictResolution> |
ConflictDescription.loadContributedResolutions(ConflictResolutionContributor resolutionContributor,
ConflictResolutionOptions resolutionOptions)
Utility method for subclasses: loads contributed conflict resolution options from the resolution contributor. |
| Uses of ConflictResolutionOptions in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
|---|
| Fields in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions declared as ConflictResolutionOptions | |
|---|---|
static ConflictResolutionOptions |
ConflictResolutionOptions.NONE
|
static ConflictResolutionOptions |
ConflictResolutionOptions.SELECT_ENCODING
|
static ConflictResolutionOptions |
ConflictResolutionOptions.SELECT_NAME
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return ConflictResolutionOptions | |
|---|---|
ConflictResolutionOptions |
ConflictResolutionOptions.combine(ConflictResolutionOptions other)
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictResolutionOptions | |
|---|---|
ConflictResolutionOptions |
ConflictResolutionOptions.combine(ConflictResolutionOptions other)
|
boolean |
ConflictResolutionOptions.contains(ConflictResolutionOptions other)
|
| Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictResolutionOptions | |
|---|---|
ConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options)
Base class constructor, should only be called by subclasses. |
|
CoreConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options,
Resolution resolution)
|
|
ExternalConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options,
ExternalToolset configuredMergeTools)
|
|
| Uses of ConflictResolutionOptions in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors |
|---|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors with parameters of type ConflictResolutionOptions | |
|---|---|
java.util.Collection<ConflictResolution> |
CompositeConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
|
java.util.Collection<ConflictResolution> |
ConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
Returns a list of contributed ConflictResolutions (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription. |
java.util.Collection<ConflictResolution> |
ExternalConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||