|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use Resolution | |
|---|---|
| com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions | |
| com.microsoft.tfs.core.clients.versioncontrol.soapextensions | |
| Uses of Resolution in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
|---|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return Resolution | |
|---|---|
Resolution |
CoreConflictResolution.getResolution()
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type Resolution | |
|---|---|
static java.lang.String |
ConflictResolutionHelper.getResolutionString(Resolution resolution)
|
| Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type Resolution | |
|---|---|
CoreConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options,
Resolution resolution)
|
|
| Uses of Resolution in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
|---|
| Fields in com.microsoft.tfs.core.clients.versioncontrol.soapextensions declared as Resolution | |
|---|---|
static Resolution |
Resolution.ACCEPT_MERGE
|
static Resolution |
Resolution.ACCEPT_THEIRS
|
static Resolution |
Resolution.ACCEPT_YOURS
|
static Resolution |
Resolution.ACCEPT_YOURS_RENAME_THEIRS
|
static Resolution |
Resolution.DELETE_CONFLICT
|
static Resolution |
Resolution.NONE
|
static Resolution |
Resolution.OVERWRITE_LOCAL
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions that return Resolution | |
|---|---|
static Resolution |
Resolution.fromWebServiceObject(ms.tfs.versioncontrol.clientservices._03._Resolution webServiceObject)
Gets the correct wrapper type for the given web service object. |
Resolution |
Conflict.getResolution()
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type Resolution | |
|---|---|
void |
Conflict.setResolution(Resolution resolution)
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||