Changes between Version 1 and Version 2 of Ru:Help/Concepts/Conflict


Ignore:
Timestamp:
2009-12-06T13:37:04+01:00 (16 years ago)
Author:
calibrator
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Ru:Help/Concepts/Conflict

    v1 v2  
    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 == #WarningAboutDetectedConflicts
     15== Конфликты при скачивании/обновлении == #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
    … …  
    2121
    2222JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:[[br]]
    23 [[Image(conflict-update-data.png)]]
     23[[Image(wiki:Help/Concepts/Conflict:conflict-update-data.png)]]
    2424
    2525== Conflict when uploading ==
    … …  
    3333JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    3434[[BR]]
    35 [[Image(conflict-upload-data.png)]]
     35[[Image(wiki:Help/Concepts/Conflict:conflict-upload-data.png)]]
    3636[[BR]]
    3737