Resolution

@webda/versioning

---

Type Alias: Resolution

Resolution = { choose: "ours" | "theirs" | "base"; } | { value: unknown; } | { text: string; }

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

Union Members

Type Literal

{ choose: "ours" | "theirs" | "base"; }

---

Type Literal

{ value: unknown; }

---

Type Literal

{ text: string; }

Resolved replacement text — used for kind: "line" conflicts where the user has edited the conflicting string (e.g., via the git-markers workflow).