|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use ResolveErrorOptions | |
---|---|
com.microsoft.tfs.core.clients.versioncontrol | |
com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
Uses of ResolveErrorOptions in com.microsoft.tfs.core.clients.versioncontrol |
---|
Fields in com.microsoft.tfs.core.clients.versioncontrol declared as ResolveErrorOptions | |
---|---|
static ResolveErrorOptions |
ResolveErrorOptions.NONE
|
static ResolveErrorOptions |
ResolveErrorOptions.RAISE_WARNINGS_FOR_ERROR
|
static ResolveErrorOptions |
ResolveErrorOptions.THROW_ON_ERROR
|
Methods in com.microsoft.tfs.core.clients.versioncontrol with parameters of type ResolveErrorOptions | |
---|---|
void |
VersionControlClient.resolveConflicts(Workspace workspace,
Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
void |
VersionControlClient.resolveLocalConflicts(Workspace workspace,
Conflict[] conflicts,
ResolveErrorOptions errorOptions)
Resolve local file conflicts. |
Uses of ResolveErrorOptions in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type ResolveErrorOptions | |
---|---|
void |
Workspace.resolveConflicts(Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
void |
Workspace.resolveConflicts(Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts,
ExternalToolset externalToolset,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Attempts to resolve conflicts according to their Resolution property. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |