Changes between Version 16 and Version 17 of Help/Concepts/Conflict
- Timestamp:
- 2009-11-05T22:12:44+01:00 (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Concepts/Conflict
v16 v17 29 29 2. Another mapper downloads the node with id 1 too, assigns it the name `"That's the name"`, and uploads it. 30 30 3. You change the name to `"Or is it this name?"` and upload to the server. 31 4. On the server, you 'reupload collides with the upload from the other mapper.31 4. On the server, your upload collides with the upload from the other mapper. 32 32 33 33 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
