SyncEngine::mergeDatabases(): merges remote into local and local into remote, using base (the
copy both sides last synced from) to combine entries edited on both sides field by field. Afterwards
both have the same content. report.conflicts lists the fields both sides changed differently.
SyncEngine::mergeDatabases(): merges
remoteintolocalandlocalintoremote, usingbase(the copy both sides last synced from) to combine entries edited on both sides field by field. Afterwards both have the same content.report.conflictslists the fields both sides changed differently.