[OSM-dev] Conflict resolution (was Re: created_by considered harmfull)

[Frederik Ramm]

Hi,

> Note that the above scenario is fragile especially because there
> is always the possibility for a 3th commit between you resolving the
> conflicts and committing.

This could be avoided by sending the version number your edit is  
based on to the server which would then only accept your edit if that  
version is still current, and reject it otherwise. (DB people have a  
term for this but I forgot... lazy locking or something?)

Bye
Frederik

-- 
Frederik Ramm  ##  eMail frederik at remote.org  ##  N49°00.09' E008°23.33'