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

[bvh]

On Thu, Aug 09, 2007 at 12:52:58PM +0200, Raphael Studer wrote:
> Bevore commiting, it would be very good to see, if someone else
> changed your ways/nodes between the time you downloaded the data and
> now (like svn update). So you can't overwrite recent changes.

Here is how I solved it in Merkaartor (but it is barely tested so
probably doesnt work as it should) :

Before you commit, you download again. If there are any conflict the
program downloads the new points/links/ways but renames them to
conflict_XXXXX (XXX being the original ID) and also leaves your
edited points/links/ways with regular id XXXXXX.

Now the user has the choice between deleting conflict_XXXXX or XXXXX
or even by hand merge them and then finally uploading.

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.

The best conflict resolution still remains conflict avoidance through
communication to ensure two persons are not editing the same things.

cu bart