Changes between Version 17 and Version 18 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-12-06T13:30:03+01:00 (16 years ago)
Author:
stoecker
Comment:

Typo

Legend:

Unmodified
Added
Removed
Modified
  • Help/Concepts/Conflict

    v17 v18  
    2424
    2525== Conflict when uploading ==
    26 If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object, JOSM will sillently skip deleting and won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
     26If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object, JOSM will silently skip deleting and won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
    2727
    2828  1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.