Changes between Version 9 and Version 10 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-10-07T13:45:42+02:00 (15 years ago)
Author:
frawe
Comment:

typos

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v9 v10  
    22= Conflict =
    33
    4 JOSM locally manages copies of OSM objects. It loads them from a file or downloads them from the OSM server and keeps them in memory. If you update a map with objects or modify their tags you are working on copies. The reference object is still kept on the server from where other users can retrieve it and where other users can send their updates to.
     4JOSM locally manages copies of OSM objects. It loads them from a file or downloads them from the OSM server and keeps them in memory. If you modify objects or add some to your map, you are working on copies. The reference object is still kept on the server from where other users can retrieve it and where other users can send their updates to.
    55
    6 This means that you don't ''own'' the objects you are currently working with, you still ''share'' them with others. If you exchange your local objects with the server your version may clash with the version somebody else sent in as update. JOSM does its best to hide these clashes from you but sometimes it can't resolve the differences between two versions automatically. In this cases it creates a '''conflict'''.
     6This means that you don't ''own'' the objects you are currently working with, you still ''share'' them with others. If you exchange your local objects with the server your version may clash with the version somebody else sent in as update. JOSM does its best to hide these clashes from you, but sometimes it can't resolve the differences between two versions automatically. In this cases it creates a '''conflict'''.
    77
    88A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.
    … …  
    1919
    2020== Conflict when uploading ==
    21 If you upload objects to the OSM server, they might "collide" there server 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:
     21If 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:
    2222
    2323  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"`.