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


Ignore:
Timestamp:
2009-10-26T16:49:07+01:00 (16 years ago)
Author:
anonymous
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v15 v16  
    1313'''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'''.
    1414
    15 == Conflicts when downloading/updating ==
     15== Conflicts when downloading/updating == #WarningAboutDetectedConflicts
    1616If 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:
    1717