|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Uses of ConflictResolution in com.microsoft.tfs.core.clients.versioncontrol.conflicts |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts that return ConflictResolution | |
---|---|
ConflictResolution[] |
WritableConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
VersionConflictDescription.getResolutions(ConflictResolutionContributor conflictResolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
UnknownConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
ServerDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
RollbackLocalConflictDescription.getResolutions(ConflictResolutionContributor conflictResolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
MergeTargetDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
MergeSourceDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
MergeConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
MergeBothDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
LocallyDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
FilenameConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
abstract ConflictResolution[] |
ConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
ConflictResolution[] |
BothDeletedConflictDescription.getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts that return types with arguments of type ConflictResolution | |
---|---|
protected java.util.Collection<ConflictResolution> |
ConflictDescription.loadContributedResolutions(ConflictResolutionContributor resolutionContributor,
ConflictResolutionOptions resolutionOptions)
Utility method for subclasses: loads contributed conflict resolution options from the resolution contributor. |
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts with parameters of type ConflictResolution | |
---|---|
boolean |
VersionConflictDescription.isResolutionEnabled(ConflictResolution resolution)
Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.) |
boolean |
DeletedConflictDescription.isResolutionEnabled(ConflictResolution resolution)
Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.) |
boolean |
ConflictDescription.isResolutionEnabled(ConflictResolution resolution)
Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.) |
Uses of ConflictResolution in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
---|
Subclasses of ConflictResolution in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions | |
---|---|
class |
AutomergeWritableConflictResolution
AutomergeWritableConflictResolution handles the special type of
conflict resolution for automerging writable conflicts. |
class |
CoreConflictResolution
A CoreConflictResolution is a type of ConflictResolution which knows how to resolve conflicts using the core conflict resolution mechanism. |
class |
ExternalConflictResolution
An ExternalConflictResolution knows how to spawn an external merge
tool to do a three-way merge to attempt to resolve the conflict. |
class |
KeepLocalWritableConflictResolution
|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return ConflictResolution | |
---|---|
ConflictResolution |
KeepLocalWritableConflictResolution.newForConflictDescription(ConflictDescription conflictDescription)
|
ConflictResolution |
ExternalConflictResolution.newForConflictDescription(ConflictDescription conflictDescription)
|
ConflictResolution |
CoreConflictResolution.newForConflictDescription(ConflictDescription conflictDescription)
|
abstract ConflictResolution |
ConflictResolution.newForConflictDescription(ConflictDescription description)
|
ConflictResolution |
AutomergeWritableConflictResolution.newForConflictDescription(ConflictDescription conflictDescription)
|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictResolution | |
---|---|
void |
ConflictResolutionStatusListener.statusChanged(ConflictResolution conflictResolution,
ConflictResolutionStatus newStatus)
Callback for ConflictResolution to update the progress of resolution. |
Uses of ConflictResolution in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors that return types with arguments of type ConflictResolution | |
---|---|
java.util.Collection<ConflictResolution> |
ExternalConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
|
java.util.Collection<ConflictResolution> |
ConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
Returns a list of contributed ConflictResolution s (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription . |
java.util.Collection<ConflictResolution> |
CompositeConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
|
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |