Changes between Version 7 and Version 8 of Help/Concepts/Conflict

Timestamp:

2009-10-06T23:29:48+02:00 (16 years ago)

Author:

Gubaer

Comment:

--

Help/Concepts/Conflict

@@ -33 +33 @@
 
 == Conflicts when merging ==
+In JOSM you can merge the objects in one data layer into another data layer. Again, this can lead to "collisions" between different versions of the same objects.
+If JOSM can't resolve them automatically it creates '''conflicts''' too. 
 
+== Resolving conflicts ==
+Each data layer maintains a list of '''conflicts''' which are not yet resolved. You can consult this list in the [wiki:/Help/Dialog/ConflictListDialog Conflict List Dialog]. 
+For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/ConflictDialog Conflict Resolution Dialog] and resolve the conflict.
+
+Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of non-resolved conflicts is empty. 
 
 == See also ==