|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use ConflictResolutionContributor | |
---|---|
com.microsoft.tfs.core.clients.versioncontrol.conflicts | |
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors |
Uses of ConflictResolutionContributor in com.microsoft.tfs.core.clients.versioncontrol.conflicts |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts with parameters of type ConflictResolutionContributor | |
---|---|
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. |
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 ConflictResolutionContributor 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 ConflictResolutionContributor | |
---|---|
void |
CompositeConflictResolutionContributor.addContributor(ConflictResolutionContributor subContributor)
|
void |
CompositeConflictResolutionContributor.addContributors(ConflictResolutionContributor[] subContributors)
|
Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors with parameters of type ConflictResolutionContributor | |
---|---|
CompositeConflictResolutionContributor(ConflictResolutionContributor[] subContributors)
|
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |