Changes between Version 24 and Version 33 of Help/Concepts/Conflict


Ignore:
Timestamp:
(multiple changes)
Author:
(multiple changes)
Comment:
(multiple changes)

Legend:

Unmodified
Added
Removed
Modified
  • Help/Concepts/Conflict

    v24 v33  
    11[[TranslatedPages]]
     2[[PageOutline(1-10,,Table of Contents)]]
     3
    24= Conflict =
    3 [[TOC(inline)]]
    45
    5 JOSM locally manages copies of [wiki:/Help/Concepts/Object OSM objects]. It [wiki:/Help/Action/Open loads them from a file] or [wiki:/Help/Action/Download downloads them from the OSM server] and keeps them in memory. If you modify objects or add objects to your map, you are working on copies. The reference objects are still kept on the server from where other users can retrieve them and where other mappers can send their updates to.
     6JOSM locally manages copies of [wikitr:/Help/Concepts/Object OSM objects]. It [wikitr:/Help/Action/Open loads them from a file] or [wikitr:/Help/Action/Download downloads them from the OSM server] and keeps them in memory. If you modify objects or add objects to your map, you are working on copies. The reference objects are still kept on the server from where other users can retrieve them and where other mappers can send their updates to.
    67
    7 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 [wiki:/Help/Concepts/Object versions] automatically. In this cases it creates a '''conflict'''.
     8This 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 [wikitr:/Help/Concepts/Object versions] automatically. In this cases it creates a '''conflict'''.
    89
    910A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.
    1011
    11 Each data layer maintains a list of unresolved conflicts in the [wiki:/Help/Dialog/ConflictList Conflict List Dialog]. In this dialog you can launch a [wiki:/Help/Dialog/Conflict dialog for resolving a conflict].
     12Each data layer maintains a list of unresolved conflicts in the [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel]. In this panel you can launch a [wikitr:/Help/Dialog/Conflict dialog for resolving a conflict].
    1213
    1314'''Resolving a conflict''' means that you have to decide for every difference between the two object versions whether you want to keep the version from the first or the second object, a process which is sometimes also called '''merging'''.
    1415
    1516== Conflicts when downloading/updating == #WarningAboutDetectedConflicts
    16 If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here's an example:
     17If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here are some examples:
    1718
    18  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"`.
    19  2. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
    20  3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[wiki:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [http://wiki.openstreetmap.org/wiki/Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
     19=== Automatic management ===
     201. You have downloaded an area.
     211. You modify the way of a landuse. In the meantime another user downloaded the same zone and deleted 4 nodes from a highway and uploads it.
     221. You select the menu ''File -> [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateData Update data]''. Some nodes no longer exist on the server even though they are still on your layer.
     23
     24JOSM notifies you by displaying the message:
     25 
     26[[Image(conflict-update-data-automatic.png,link=)]]
     27
     28When you click on **Check on the server**: JOSM can resolve this automatically by deleting nodes on your layer that are no longer on the server and do not collide with your modification.
     29JOSM does not create a conflict.
     30
     31=== Conflict creation ===
     321. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
     331. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
     341. You select the menu ''File -> [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [osmwiki:Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
    2135
    2236JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    23 [[Image(conflict-update-data.png)]]
     37
     38[[Image(conflict-update-data-detected.png,link=)]]
     39
     40and creates an unresolved conflict.
     41
    2442
    2543== Conflict when uploading ==
    2644If 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:
    2745
    28   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"`.
    29   2. Another mapper downloads the node with id 1 too, assigns it the name `"That's the name"`, and uploads it.
    30   3. You change the name to `"Or is it this name?"` and upload to the server.
    31   4. On the server, your upload collides with the upload from the other mapper.
     461. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
     471. Another mapper downloads the node with id:1 too, assigns it the name `"That's the name"`, and uploads it.
     481. You change the name to `"Or is it this name?"` and upload to the server.
     491. On the server, your upload collides with the upload from the other mapper.
    3250
    3351JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    34 [[Image(conflict-upload-data.png)]]
     52
     53[[Image(conflict-upload-data.png,link=)]]
    3554
    3655== Conflicts when merging ==
     
    3857If JOSM can't resolve them automatically it creates '''conflicts''' too.
    3958
    40 == Resolving conflicts ==
    41 Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialog/ConflictList Conflict List Dialog].
    42 For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it.
     59== Resolving conflicts ==#Resolvingconflicts
     60Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel].
     61For each '''conflict''' listed there you can (and should) launch the [wikitr:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it.
    4362
    4463Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of unresolved conflicts is empty.
    4564
    4665== Technical background ==
    47 
    48 For each change set that affects an object, the server assigns an increasing version number to that object. (This is shown in the history e.g. [http://api.openstreetmap.org/browse/way/1222/history way 1222].) JOSM remembers the version of the downloaded objects and reports it back to the server on upload. If the server has a higher version number (due to a change by another mapper), it rejects the uploaded change. In this situation JOSM creates a conflict. The version that is called "my" in conflict resolution dialog is the old, downloaded version, but with your local modifications applied. The version that is called "their" is the most current version on the server that is then automatically downloaded from the server.
     66For each change set that affects an object, the server assigns an increasing version number to that object. (This is shown in the history e.g. [osmwww:browse/way/1222/history way 1222].) JOSM remembers the version of the downloaded objects and reports it back to the server on upload. If the server has a higher version number (due to a change by another mapper), it rejects the uploaded change. In this situation JOSM creates a conflict. The version that is called "my" in conflict resolution dialog is the old, downloaded version, but with your local modifications applied. The version that is called "their" is the most current version on the server that is then automatically downloaded from the server.
    4967
    5068== See also ==
    51 
    52  * [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
    53  * [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
     69* [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel] - displays the list of conflicts in the current data layer
     70* [wikitr:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5471
    5572----
    56 Back to [wiki:Help Main Help]
     73Back to [wikitr:/Help Main Help]