Type Alias AdvancedMergeResult<T>

Type Declaration

• { conflicts: []; ok: true; report?: AdvancedMergeReport; value: T }
• {
      conflicts: AdvancedMergeConflict[];
      kind: "conflict";
      ok: false;
      report?: AdvancedMergeReport;
  }
• {
      conflicts: AdvancedMergeConflict[];
      kind: "invalid";
      ok: false;
      report?: AdvancedMergeReport;
      violations: RuleViolation[];
  }
• {
      conflicts: [];
      kind: "review";
      ok: false;
      report: AdvancedMergeReport;
      value: T;
  }

  • conflicts: []

  • kind: "review"

  • ok: false

    Complete, but combines both sides' changes; confirm before saving.

  • report: AdvancedMergeReport

  • value: T