Uses of Class
com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription

Packages that use ConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts   
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions   
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors   
 

Uses of ConflictDescription in com.microsoft.tfs.core.clients.versioncontrol.conflicts
 

Subclasses of ConflictDescription in com.microsoft.tfs.core.clients.versioncontrol.conflicts
 class BothDeletedConflictDescription
          This is a deleted conflict, occurring when you attempt to delete a file that the server has already removed.
 class DeletedConflictDescription
           
 class FilenameConflictDescription
          This is a filename conflict, occurring when a get request would produce a local file with the same name as an already existing file.
 class LocallyDeletedConflictDescription
          This is a deleted conflict, occurring when you attempt to delete a file that the server has edited.
 class MergeBothDeletedConflictDescription
          This is a deleted conflict, occurring when you attempt to delete a file that the server has already removed.
 class MergeConflictDescription
          This is a merge conflict, occurring when you attempt to merge two branches, and a file has been changed in both branches.
 class MergeSourceDeletedConflictDescription
           
 class MergeTargetDeletedConflictDescription
          This is a merge deleted conflict, occurring when you attempt to merge such that a file in the source branch has been modified and the file in the target branch has been deleted.
 class RollbackLocalConflictDescription
           
 class ServerDeletedConflictDescription
          This is a deleted conflict, occurring when you attempt to edit a file such that the remote file has been deleted.
 class ShelvesetConflictDescription
           
 class UnknownConflictDescription
           
 class VersionConflictDescription
          This is a version conflict - the typical type of conflict, occuring when there have been both local and server changes to a file.
 class WritableConflictDescription
          This is a writable conflict, occurring when a local file is marked writable but is not checked out.
 

Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts that return ConflictDescription
static ConflictDescription ConflictDescriptionFactory.getConflictDescription(ConflictCategory category)
          Get a ConflictDescription which describes the type of conflict, but does not hold a particular Conflict.
static ConflictDescription ConflictDescriptionFactory.getConflictDescription(ConflictCategory category, Conflict conflict)
          Get a ConflictDescription which describes the type of conflict.
static ConflictDescription ConflictDescriptionFactory.getConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
          Get a ConflictDescription for this particular Conflict.
static ConflictDescription[] ConflictDescriptionFactory.getConflictDescriptions(Workspace workspace, Conflict[] conflicts, ItemSpec[] conflictItemSpecs)
          Convenience method to get multiple conflict descriptions for multiple conflicts.
 

Uses of ConflictDescription in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions
 

Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return ConflictDescription
 ConflictDescription ConflictResolution.getConflictDescription()
          Gets the ConflictDescription which will be resolved by this resolver.
 

Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictDescription
 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)
           
 

Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictDescription
AutomergeWritableConflictResolution(ConflictDescription conflictDescription, java.lang.String description, java.lang.String helpText)
           
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)
           
KeepLocalWritableConflictResolution(ConflictDescription conflictDescription, java.lang.String description, java.lang.String helpText)
           
 

Uses of ConflictDescription 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 ConflictDescription
 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 ConflictResolutions (eg, external merge tools, internal merge tools, etc.) that are available to this ConflictDescription.
 java.util.Collection<ConflictResolution> CompositeConflictResolutionContributor.getConflictResolutions(ConflictDescription conflictDescription, ConflictResolutionOptions resolutionOptions)
           
 



© 2015 Microsoft. All rights reserved.