com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors
Interface ConflictResolutionContributor

All Known Implementing Classes:
CompositeConflictResolutionContributor, ExternalConflictResolutionContributor

public interface ConflictResolutionContributor

Since:
TEE-SDK-10.1

Method Summary
 java.util.Collection<ConflictResolution> 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.
 

Method Detail

getConflictResolutions

java.util.Collection<ConflictResolution> 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.

Parameters:
conflictDescription - The ConflictDescription being resolved
resolutionOptions - The ConflictResolutionOptionss for this resolution
Returns:
A collection of conflict resolutions (never null)


© 2015 Microsoft. All rights reserved.