Skip to documentation content
On this page
  1. Reference contract
  2. Authoritative source

resolutions

Configures resolutions for Apply merge from its authoritative release declaration.

Reference contract

FieldValueDescription
valueTypeconflict-resolution-mapDeclared input representation.
defaultRelease default applied when the field is omitted.
typescriptTypeRecord<string, { choice: string; value?: unknown; }>Compiler-resolved TypeScript contract.
requiredtrue

Configures resolutions for Apply merge from its authoritative release declaration.

The declared value type is conflict-resolution-map. This field is required.

Authoritative source

Catalog
telion.app/0.1.0-beta
Identity
service/version-control/merge-apply/field/resolutions
Path
apps/desktop-electron/src/ui/VersionHistoryPanel.tsx
Symbol
VersionHistoryPanelProps.onMergeApply