|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.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.MergeTargetDeletedConflictDescription
public final 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. It is a special case of
DeletedConflictDescription
.
Constructor Summary | |
---|---|
protected |
MergeTargetDeletedConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
|
Method Summary | |
---|---|
ConflictCategory |
getConflictCategory()
Gets the category of this conflict |
java.lang.String |
getDescription()
A long description of this conflict, suitable for display to the user. |
java.lang.String |
getLocalFileDescription()
The local file in a merge conflict is called the "source". |
java.lang.String |
getName()
A short description of the conflict, eg "Version Conflict" |
java.lang.String |
getRemoteFileDescription()
The server file in a merge conflict is called the "target". |
ConflictResolution[] |
getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.DeletedConflictDescription |
---|
analyzeConflict, getChangeDescription, isResolutionEnabled, showChangeDescription |
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription |
---|
clearAnalysis, filesRenamed, filesRenamedOnly, hasAnalyzed, isEncodingChange, targetRenamed |
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription |
---|
getConflict, getConflictItemSpecs, getLocalPath, getLocalPath, getServerPath, getWorkspace, isBaseless, loadContributedResolutions |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
protected MergeTargetDeletedConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
Method Detail |
---|
public java.lang.String getName()
getName
in class VersionConflictDescription
public ConflictCategory getConflictCategory()
getConflictCategory
in class VersionConflictDescription
public java.lang.String getDescription()
getDescription
in class VersionConflictDescription
public java.lang.String getLocalFileDescription()
getLocalFileDescription
in class ConflictDescription
public java.lang.String getRemoteFileDescription()
getRemoteFileDescription
in class ConflictDescription
public ConflictResolution[] getResolutions(ConflictResolutionContributor resolutionContributor)
null
and
contains a matching tool, external resolution options may be available.
getResolutions
in class VersionConflictDescription
resolutionContributor
- an object which contributes resolutions for conflicts. May be
null
, but external resolution options won't be
available.
ConflictResolution
s for this particular
conflict.
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |