Changes between Version 25 and Version 33 of Help/Concepts/Conflict
- Timestamp:
- (multiple changes)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Concepts/Conflict
v25 v33 1 1 [[TranslatedPages]] 2 [[PageOutline(1-10,,Table of Contents)]] 3 2 4 = Conflict = 3 [[TOC(inline)]]4 5 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.6 JOSM 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. 6 7 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'''.8 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 [wikitr:/Help/Concepts/Object versions] automatically. In this cases it creates a '''conflict'''. 8 9 9 10 A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically. 10 11 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].12 Each 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]. 12 13 13 14 '''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'''. 14 15 15 16 == 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:17 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 are some examples: 17 18 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 === Automatic management === 20 1. You have downloaded an area. 21 1. 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. 22 1. 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 24 JOSM notifies you by displaying the message: 25 26 [[Image(conflict-update-data-automatic.png,link=)]] 27 28 When 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. 29 JOSM does not create a conflict. 30 31 === Conflict creation === 32 1. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`. 19 33 1. 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 1. You select the menu ''File -> [[ Image(source:trunk/images/updatedata.png)]] [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.34 1. 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. 21 35 22 36 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: 23 37 24 [[Image(conflict-update-data.png)]] 38 [[Image(conflict-update-data-detected.png,link=)]] 39 40 and creates an unresolved conflict. 41 25 42 26 43 == Conflict when uploading == 27 44 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 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: 28 45 29 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"`.46 1. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`. 30 47 1. Another mapper downloads the node with id:1 too, assigns it the name `"That's the name"`, and uploads it. 31 48 1. You change the name to `"Or is it this name?"` and upload to the server. … … 34 51 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: 35 52 36 [[Image(conflict-upload-data.png )]]53 [[Image(conflict-upload-data.png,link=)]] 37 54 38 55 == Conflicts when merging == … … 40 57 If JOSM can't resolve them automatically it creates '''conflicts''' too. 41 58 42 == Resolving conflicts == 43 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].44 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 60 Each 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]. 61 For each '''conflict''' listed there you can (and should) launch the [wikitr:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it. 45 62 46 63 Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of unresolved conflicts is empty. 47 64 48 65 == Technical background == 49 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.66 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. [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. 50 67 51 68 == See also == 52 * [ wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer53 * [wiki :/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict69 * [[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 54 71 55 72 ---- 56 Back to [wiki :Help Main Help]73 Back to [wikitr:/Help Main Help]
