Changes between Version 10 and Version 11 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-10-07T21:32:32+02:00 (16 years ago)
Author:
Gubaer
Comment:

extended

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v10 v11  
    77
    88A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.
     9
     10Each data layer maintains a list of unresolved conflicts in the [wiki:/Help/Dialogs/ConflictListDialog Conflict List Dialog]. In this dialog you can launch a [wiki:/Help/Dialog/ConflictDialog dialog for resolving a conflict].
     11
     12'''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'''.
    913
    1014== Conflicts when downloading/updating ==
    … …  
    4448== See also ==
    4549
    46  * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - You can use the conflict dialog to resolve a conflict
     50 * [wiki:/Help/Dialogs/ConflictListDialog Conflict List Dialog] - displays the list of conflicts in the current data layer
     51 * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    4752
    4853