Opened 14 years ago

Closed 8 years ago

#105 closed defect (fixed)

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

Reported by: mikel_maron@… Owned by: mikel_maron@…
Priority: major Milestone:
Component: admin Version:
Keywords: Cc:


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.

Change History (2)

comment:1 Changed 13 years ago by Immanuel Scholz

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.


comment:2 Changed 8 years ago by stevens

Resolution: fixed
Status: newclosed

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.

Note: See TracTickets for help on using tickets.