|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use ConflictOptions | |
|---|---|
| com.microsoft.tfs.core.clients.versioncontrol.soapextensions | |
| Uses of ConflictOptions in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
|---|
| Fields in com.microsoft.tfs.core.clients.versioncontrol.soapextensions declared as ConflictOptions | |
|---|---|
static ConflictOptions |
ConflictOptions.DISALLOW_AUTO_MERGE
Informs the client that it should disallow auto-merge. |
static ConflictOptions |
ConflictOptions.LOCAL_CHANGES_REDUNDANT_IN_TARGET_VERSION
Current only used for version conflicts. |
static ConflictOptions |
ConflictOptions.NONE
|
static ConflictOptions |
ConflictOptions.PENDING_LOCAL_VERSION_MISMATCH
Indicates that this conflict is due to a local / pending version mismatch. |
| Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions that return ConflictOptions | |
|---|---|
static ConflictOptions |
ConflictOptions.fromIntFlags(int flags)
|
ConflictOptions |
Conflict.getConflictOptions()
|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type ConflictOptions | |
|---|---|
boolean |
ConflictOptions.contains(ConflictOptions disallowAutoMerge)
|
void |
Conflict.setConflictOptions(ConflictOptions options)
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||