Changes between Version 14 and Version 15 of Help/Concepts/Conflict

Timestamp:

2009-10-14T11:11:14+02:00 (16 years ago)

Author:

anonymous

Comment:

added links

Help/Concepts/Conflict

@@ -3 +3 @@
 = Conflict =
 
-JOSM locally manages copies of OSM objects. It loads them from a file or downloads them from the OSM server and keeps them in memory. If you modify objects or add some to your map, you are working on copies. The reference object is still kept on the server from where other users can retrieve it and where other users can send their updates to. 
+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. 
 
-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 versions automatically. In this cases it creates a '''conflict'''.
+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'''.
 
 A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.