Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modifying a fork without merging conflict #8

Closed
gmaclennan opened this issue Jan 15, 2016 · 1 comment
Closed

Modifying a fork without merging conflict #8

gmaclennan opened this issue Jan 15, 2016 · 1 comment

Comments

@gmaclennan
Copy link
Member

From the readme 'To merge these "conflicts" back into a single value, use osm.put(id, doc, cb) to store the desired document value.'

How do you update a doc that has a fork without merging? I can think of several scenarios where a user would need to update a forked doc (i.e. update one of the forks) and postpone dealing with merging / resolving conflicts.

@ghost
Copy link

ghost commented Jan 19, 2016

You can give put() an array of opts.links to point back at. If opts.links isn't defined, the default value is the most recent set of updates. This behavior is documented in hyperkv, but the explanation could be moved inline into the osm-p2p-db docs.

@ghost ghost closed this as completed Jan 19, 2016
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant