Skip to content

CrConflictFile

reference
1 min readUpdated

Kind: Interface

Source: atloria-monorepo/apps/api/src/change-request/change-request.service.ts

One file's conflict report inside conflictState: the 'conflict' sections verbatim plus counts of how the OTHER sections classified (so the UI can say "2 of 7 sections conflict").

Properties

PropertyType
pathstring
documentIdstring
sectionsThreeWaySection[]
counts{ unchanged: number; 'take-theirs': number; 'keep-mine': number; conflict: number }

Was this page helpful?

Download as PDF