Changes between Version 27 and Version 28 of Help/Concepts/Conflict
- Timestamp:
- 2019-09-25T10:52:35+02:00 (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Concepts/Conflict
v27 v28 4 4 = Conflict = 5 5 6 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. 7 7 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 [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'''. 9 9 10 10 A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically. 11 11 12 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 [wikitr:/Help/Dialog/ConflictList Conflict List Dialog]. In this dialog you can launch a [wikitr:/Help/Dialog/Conflict dialog for resolving a conflict]. 13 13 14 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'''. … … 19 19 1. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`. 20 20 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. 21 1. You select the menu ''File -> [[Image(source:trunk/images/updatedata.png,middle)]] [wiki:/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 1. You select the menu ''File -> [[Image(source:trunk/images/updatedata.png,middle)]] [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. 22 22 23 23 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: … … 41 41 If JOSM can't resolve them automatically it creates '''conflicts''' too. 42 42 43 == Resolving conflicts == 44 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]. 45 For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it. 43 == Resolving conflicts ==#Resolvingconflicts 44 Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wikitr:/Help/Dialog/ConflictList Conflict List Dialog]. 45 For each '''conflict''' listed there you can (and should) launch the [wikitr:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it. 46 46 47 47 Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of unresolved conflicts is empty. … … 51 51 52 52 == See also == 53 * [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer 54 * [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict 53 * [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer 54 * [wikitr:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict 55 55 56 56 ---- 57 Back to [wiki:Help Main Help] 57 Back to [wikitr:Help Main Help]
