Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

merge and conflict resolution for offline mode; and online work in the same region. #105

Closed
openstreetmap-trac opened this issue Jul 23, 2021 · 2 comments

Comments

@openstreetmap-trac
Copy link

Reporter: mikel_maron[at]yahoo.com
[Submitted to the original trac issue database at 12.43pm, Friday, 16th December 2005]

With offline editors, there's the potential for edit conflicts. For the time being, I don't think we need to be too concerned. But as the volume of use on OSM grows, we'll need to devise methods and interfaces for resolving geographic conflicts.

That may even become an issue with the online editors. If two or more people are editing the same area, they'll need an additional channel to communicate, to avoid stepping on toes and cooperate.

@openstreetmap-trac
Copy link
Author

Author: immanuel.scholz[at]gmx.de
[Added to the original trac issue at 10.44pm, Tuesday, 31st January 2006]

The first thing to allow offline editor coders to approach this is to provide a function which gives the changes of a specific item since a specific timestamp. (If defining an apropiated diff-format is too difficult, at least the possibility to retrieve the data how it was on a specific timestamp is necessary).

This way, the offline editors can detect edit conflicts.

Imi.

@openstreetmap-trac
Copy link
Author

Author: stevens
[Added to the original trac issue at 1.54am, Tuesday, 23rd August 2011]

v6 of the API has versioning.
This makes it possible to detect conflicts. JOSM provides an interface for resolving them.
I'd call this fixed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

1 participant