Package com.microsoft.tfs.core.clients.versioncontrol.conflicts

Class Summary
BothDeletedConflictDescription This is a deleted conflict, occurring when you attempt to delete a file that the server has already removed.
ConflictCategory A ConflictCategory is a typed enumeration of known types of conflicts.
ConflictDescription This is the base conflict description class.
ConflictDescriptionFactory  
ConflictDescriptionPathType  
ConflictDescriptionStrings  
DeletedConflictDescription  
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.
LocallyDeletedConflictDescription This is a deleted conflict, occurring when you attempt to delete a file that the server has edited.
MergeBothDeletedConflictDescription This is a deleted conflict, occurring when you attempt to delete a file that the server has already removed.
MergeConflictDescription This is a merge conflict, occurring when you attempt to merge two branches, and a file has been changed in both branches.
MergeSourceDeletedConflictDescription  
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.
RollbackLocalConflictDescription  
ServerDeletedConflictDescription This is a deleted conflict, occurring when you attempt to edit a file such that the remote file has been deleted.
ShelvesetConflictDescription  
UnknownConflictDescription  
VersionConflictDescription This is a version conflict - the typical type of conflict, occuring when there have been both local and server changes to a file.
WritableConflictDescription This is a writable conflict, occurring when a local file is marked writable but is not checked out.
 



© 2015 Microsoft. All rights reserved.