Changes between Version 18 and Version 19 of Help/Concepts/Conflict
- Timestamp:
- 2010-05-03T20:01:24+02:00 (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Concepts/Conflict
v18 v19 1 1 [[TranslatedPages]] 2 [[TOC(inline)]]3 2 = Conflict = 4 3 … … 13 12 '''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 13 14 [[TOC(inline)]] 15 15 16 == Conflicts when downloading/updating == #WarningAboutDetectedConflicts 16 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's an example: … … 20 21 3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[wiki:/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. 21 22 22 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: [[br]]23 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: 23 24 [[Image(conflict-update-data.png)]] 24 25 … … 32 33 33 34 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows: 34 [[BR]]35 35 [[Image(conflict-upload-data.png)]] 36 [[BR]]37 38 36 39 37 == Conflicts when merging == … … 52 50 * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - you can use the conflict dialog to resolve a conflict 53 51 54 55 [[BR]]52 ---- 53 Back to [wiki:Help Main Help]
