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

Interface Summary
ConflictResolutionStatusListener  
 

Class Summary
AutomergeWritableConflictResolution AutomergeWritableConflictResolution handles the special type of conflict resolution for automerging writable conflicts.
ConflictResolution Base class for conflict resolution.
ConflictResolutionHelper  
ConflictResolutionOptions  
ConflictResolutionStatus A typed enum representing the status of a running conflict resolution.
CoreConflictResolution A CoreConflictResolution is a type of ConflictResolution which knows how to resolve conflicts using the core conflict resolution mechanism.
ExternalConflictResolution An ExternalConflictResolution knows how to spawn an external merge tool to do a three-way merge to attempt to resolve the conflict.
ExternalConflictResolution.ExternalConflictResolver  
KeepLocalWritableConflictResolution  
 



© 2015 Microsoft. All rights reserved.