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


Ignore:
Timestamp:
2011-06-03T15:19:07+02:00 (15 years ago)
Author:
anonymous
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Uk:Help/Concepts/Conflict

    v1 v2  
    3333
    3434JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    35 [[Image(conflict-upload-data.png)]]
     35[[Image(Help/Concepts/Conflict:conflict-upload-data.png)]]
    3636
    3737== Conflicts when merging ==