Function resolveFields

resolveFields(
    local: KdbxEntry,
    remote: KdbxEntry,
    base: KdbxEntry,
    localIsNewer: boolean,
    dbs?: { local?: Kdbx; remote?: Kdbx },
): Resolution
resolveFields(): three-way merge of the fields. A field one side changed takes that change; one both changed differently takes the newer side's value and counts as a conflict.
Parameters
- local: KdbxEntry
- remote: KdbxEntry
- base: KdbxEntry
- localIsNewer: boolean
- dbs: { local?: Kdbx; remote?: Kdbx } = {}
Returns Resolution
- Defined in merge/fields.ts:146