|
||||||||||
| 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.MergeConflictDescription
public class MergeConflictDescription
This is a merge conflict, occurring when you attempt to merge two branches, and a file has been changed in both branches. Note that in Visual Studio UI parlance, "accept theirs" means to accept the merge source; "accept yours" means to accept the merge target. Updated for TFS 2010.
| Constructor Summary | |
|---|---|
protected |
MergeConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
|
| Method Summary | |
|---|---|
protected boolean |
filesRenamed()
|
ConflictCategory |
getConflictCategory()
Gets the category of this conflict |
java.lang.String |
getDescription()
A long description of this conflict, suitable for display to the user. eg ("You have a conflicting pending change.") |
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. If the toolset is not null and
contains a matching tool, external resolution options may be available. |
java.lang.String |
getServerPath()
Gets the server filename affected by this conflict. |
protected boolean |
targetRenamed()
Exists only to be overridden by merge. |
| Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription |
|---|
analyzeConflict, clearAnalysis, filesRenamedOnly, getChangeDescription, hasAnalyzed, isEncodingChange, isResolutionEnabled, showChangeDescription |
| Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription |
|---|
getConflict, getConflictItemSpecs, getLocalPath, getLocalPath, getWorkspace, isBaseless, loadContributedResolutions |
| Methods inherited from class java.lang.Object |
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
| Constructor Detail |
|---|
protected MergeConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
| Method Detail |
|---|
public ConflictCategory getConflictCategory()
getConflictCategory in class VersionConflictDescriptionpublic java.lang.String getName()
getName in class VersionConflictDescriptionpublic java.lang.String getDescription()
getDescription in class VersionConflictDescriptionpublic java.lang.String getLocalFileDescription()
getLocalFileDescription in class ConflictDescriptionpublic java.lang.String getRemoteFileDescription()
getRemoteFileDescription in class ConflictDescriptionpublic java.lang.String getServerPath()
ConflictDescription
getServerPath in class ConflictDescriptionprotected boolean filesRenamed()
filesRenamed in class VersionConflictDescriptionprotected boolean targetRenamed()
VersionConflictDescription
targetRenamed in class VersionConflictDescriptionpublic ConflictResolution[] getResolutions(ConflictResolutionContributor resolutionContributor)
null and
contains a matching tool, external resolution options may be available.
getResolutions in class VersionConflictDescriptionresolutionContributor - an object which contributes resolutions for conflicts. May be
null, but external resolution options won't be
available.
ConflictResolutions for this particular
conflict.
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||