AutoResolveOptions Enumeration
Enum specifying which conflicts will be resolved as automerge
This enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'Declaration
<FlagsAttribute> _
Public Enumeration AutoResolveOptions
[FlagsAttribute]
public enum AutoResolveOptions
[FlagsAttribute]
public enum class AutoResolveOptions
[<FlagsAttribute>]
type AutoResolveOptions
public enum AutoResolveOptions
Members
| Member name | Description | |
|---|---|---|
| All | All content and redundant conflicts will be resolved. | |
| AllContent | All conflicts will be resolved and conflict that require name or encoding will be reported to the user. | |
| AllSilent | All conflicts will be resolved, conflict that require name or encoding will be ignored. | |
| BothLocalTargetAndServerSource | All conflicts with ChangeSummary.TotalConflict = 0 will be resolved. | |
| IncomingRename | Conflict that include source/server rename, but not local/target rename will be resolved. | |
| None | Does nothing | |
| OnlyLocalTarget | Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalLatest = 0 will be resolved. | |
| OnlyServerSource | Only conflicts with ChangeSummary.TotalConflicting = 0 and TotalModified = 0 will be resolved. | |
| 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 Content is compared for Edit and Branch changes. | |
| Silent | Conflicts that require name or encoding parameters are not reported to the user. |