Function combineEntries

combineEntries(
    local: KdbxEntry,
    localDb: Kdbx,
    remote: KdbxEntry,
    remoteDb: Kdbx,
    base: KdbxEntry,
    now?: () => Date,
): Promise<string[]>
combineEntries(): gives both entries the combined fields and the same modification time, so the structure merge sees one version. Each keeps its previous state in its history.
Parameters
- local: KdbxEntry
- localDb: Kdbx
- remote: KdbxEntry
- remoteDb: Kdbx
- base: KdbxEntry
- now: () => Date = ...
Returns Promise<string[]>
- Defined in merge/merger.ts:38