|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Classes in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions used by com.microsoft.tfs.core.clients.versioncontrol.conflicts | |
|---|---|
| ConflictResolution
Base class for conflict resolution. |
|
| ConflictResolutionOptions
|
|
| Classes in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions used by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions | |
|---|---|
| ConflictResolution
Base class for conflict resolution. |
|
| ConflictResolutionOptions
|
|
| ConflictResolutionStatus
A typed enum representing the status of a running conflict resolution. |
|
| ConflictResolutionStatusListener
|
|
| CoreConflictResolution
A CoreConflictResolution is a type of ConflictResolution which knows how to resolve conflicts using the core conflict resolution mechanism. |
|
| ExternalConflictResolution.ExternalConflictResolver
|
|
| Classes in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions used by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors | |
|---|---|
| ConflictResolution
Base class for conflict resolution. |
|
| ConflictResolutionOptions
|
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||