Export (0) Print
Expand All
Expand Minimize

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)

[FlagsAttribute]
public enum AutoResolveOptions

Member nameDescription
AllAll content and redundant conflicts will be resolved.

AllContentAll conflicts will be resolved and conflict that require name or encoding will be reported to the user.

AllSilentAll conflicts will be resolved, conflict that require name or encoding will be ignored.

BothLocalTargetAndServerSourceAll conflicts with ChangeSummary.TotalConflict = 0 will be resolved.

IncomingRenameConflict that include source/server rename, but not local/target rename will be resolved.

NoneDoes nothing

OnlyLocalTargetOnly conflicts with ChangeSummary.TotalConflicting = 0 and TotalLatest = 0 will be resolved.

OnlyServerSourceOnly conflicts with ChangeSummary.TotalConflicting = 0 and TotalModified = 0 will be resolved.

RedundantBehavior 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.

SilentConflicts that require name or encoding parameters are not reported to the user.

Show:
© 2014 Microsoft