redgeoff / delta-pouch

Conflict-free collaborative editing for PouchDB
196 stars 13 forks source link

Merge #45

Closed connelhooley closed 7 years ago

connelhooley commented 9 years ago

I noticed a merge function in one of the demo's.

function onChange(doc) {
    profile = db.merge(profile, doc);
    display();
}

I cannot find this in in the PouchDB API if it is in this plug in, what does it do? Could something be added to the read me? thanks

t-knapp commented 7 years ago

The merge(obj1, obj2) function is implemented in the delta-pouch plugin file.