search

automerge / hypermerge

Build p2p collaborative applications without any server infrastructure in Node.js
MIT License
1.28k stars 66 forks source link

Update fork & merge change blocks to return doc #4

Closed mmcgrana closed 6 years ago

mmcgrana commented 6 years ago

These returns are required by the WIP immutable-write-interface branch of Automerge, to be able to fork and merge docs via Hypermerge.

The mutable branch of Automerge ignores the return value of the change block, so this should be fine for existing apps.

mmcgrana commented 6 years ago

@pvh for your review.

For now it's fine to pull this only into automerge/immutable-interface, not master there.

pvh commented 6 years ago

Looks good to me. Merged.