ConflictResolutionType Property

Gets or sets the conflict resolution type.

Syntax

public ConflictResolutionType ConflictResolutionType {get; set;}

Public Property ConflictResolutionType As ConflictResolutionType

Remarks

The default value is ConflictResolutionType.FavorEditVersion, and this is the only value supported by branch versioning. Using a different value with branch versioning will cause Version.Reconcile to throw a System.NotSupportedException.

Requirements

Target Platforms: Windows 10, Windows 8.1, Windows 7