Class ConflictReport
Result of a three-way conflict detection.
public sealed class ConflictReport
- Inheritance
-
ConflictReport
- Inherited Members
Properties
AncestorVersion
public required string AncestorVersion { get; init; }
Property Value
AutoResolved
public IReadOnlyList<string> AutoResolved { get; init; }
Property Value
Conflicts
public IReadOnlyList<WorkflowConflict> Conflicts { get; init; }
Property Value
HasConflicts
public bool HasConflicts { get; init; }
Property Value
OurVersion
public required string OurVersion { get; init; }
Property Value
TheirVersion
public required string TheirVersion { get; init; }