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


Ignore:
Timestamp:
2009-10-06T23:50:11+02:00 (15 years ago)
Author:
Gubaer
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v8 v9  
    3737
    3838== Resolving conflicts ==
    39 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].
    40 For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/ConflictDialog Conflict Resolution Dialog] and resolve the conflict.
     39Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialog/ConflictListDialog Conflict List Dialog].
     40For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/ConflictDialog Conflict Resolution Dialog] and resolve it.
    4141
    4242Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of non-resolved conflicts is empty.