|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use AutoResolveOptions | |
---|---|
com.microsoft.tfs.core.clients.versioncontrol | |
com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
Uses of AutoResolveOptions in com.microsoft.tfs.core.clients.versioncontrol |
---|
Fields in com.microsoft.tfs.core.clients.versioncontrol declared as AutoResolveOptions | |
---|---|
static AutoResolveOptions |
AutoResolveOptions.ALL
All content and redundant conflicts will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.ALL_CONTENT
All conflicts will be resolved and conflict that require name or encoding will be reported to the user. |
static AutoResolveOptions |
AutoResolveOptions.ALL_SILENT
All content and redundant conflicts will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.BOTH_LOCAL_TARGET_AND_SERVER_SOURCE
All conflicts with ChangeSummary.TotalConflict = 0 will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.INCOMING_RENAME
Conflicts that include source/server rename, but not local/target rename will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.NONE
Do nothing. |
static AutoResolveOptions |
AutoResolveOptions.ONLY_LOCAL_TARGET
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalLatest = 0 will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.ONLY_SERVER_SOURCE
Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalModified = 0 will be resolved. |
static AutoResolveOptions |
AutoResolveOptions.REDUNDANT
Behavior intended for Gated Checkin: - Only version Get/Checkin - If Your and Their change is identical, content, encoding and path are identical resolves conflicts as TakeTheirs. |
static AutoResolveOptions |
AutoResolveOptions.SILENT
Conflicts that require name or encoding parameters are not reported to the user. |
Methods in com.microsoft.tfs.core.clients.versioncontrol with parameters of type AutoResolveOptions | |
---|---|
Conflict[] |
VersionControlClient.autoResolveValidConflicts(Workspace workspace,
Conflict[] conflicts,
AutoResolveOptions resolveOptions)
Takes a list of candidates for AutoResolve and attempts to resolve them with the correct resolution and performing a content merge if necessary. |
boolean |
AutoResolveOptions.contains(AutoResolveOptions other)
|
Uses of AutoResolveOptions in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type AutoResolveOptions | |
---|---|
boolean |
Conflict.isAutoMergeApplicable(AutoResolveOptions resolveOptions)
Return True if conflict can be auto resolved as AcceptMerge in the given mode. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |