|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use VersionConflictDescription | |
---|---|
com.microsoft.tfs.core.clients.versioncontrol.conflicts |
Uses of VersionConflictDescription in com.microsoft.tfs.core.clients.versioncontrol.conflicts |
---|
Subclasses of VersionConflictDescription 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 |
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
|
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |