Conflict

@webda/versioning

---

Type Alias: Conflict

Conflict = { base: unknown; kind: "value" | "array-item" | "delete-modify"; ours: unknown; path: Path; theirs: unknown; } | { base: unknown; hunks: { ours: UnifiedDiff; theirs: UnifiedDiff; }; kind: "line"; ours: unknown; path: Path; theirs: unknown; }

Defined in: packages/versioning/src/types.ts:27

Structured 3-way merge conflict. Use kind to discriminate; hunks is present only on line conflicts.