com.microsoft.tfs.core.clients.versioncontrol.conflicts
Class LocallyDeletedConflictDescription
java.lang.Object
com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.DeletedConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.LocallyDeletedConflictDescription
public class LocallyDeletedConflictDescription
- extends DeletedConflictDescription
This is a deleted conflict, occurring when you attempt to delete a file that
the server has edited.
- Since:
- TEE-SDK-10.1
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
LocallyDeletedConflictDescription
protected LocallyDeletedConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
getConflictCategory
public ConflictCategory getConflictCategory()
- Gets the category of this conflict
- Overrides:
getConflictCategory
in class VersionConflictDescription
- Returns:
- A ConflictCategory for this conflict
getDescription
public java.lang.String getDescription()
- A long description of this conflict, suitable for display to the user. eg
("You have a conflicting pending change.")
- Overrides:
getDescription
in class VersionConflictDescription
- Returns:
- A string representing the description of the conflict
getResolutions
public ConflictResolution[] getResolutions(ConflictResolutionContributor resolutionContributor)
- Gets the resolution options for this particular conflict with the
available merge toolset. If the toolset is not
null
and
contains a matching tool, external resolution options may be available.
- Overrides:
getResolutions
in class VersionConflictDescription
- Parameters:
resolutionContributor
- an object which contributes resolutions for conflicts. May be
null
, but external resolution options won't be
available.
- Returns:
- An array of
ConflictResolution
s for this particular
conflict.
© 2015 Microsoft. All rights reserved.