Changes between Version 22 and Version 23 of Help/Concepts/Conflict


Ignore:
Timestamp:
Jan 2, 2011 1:57:43 AM (2 years ago)
Author:
stoecker
Comment:

Fix link.

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v22 v23  
    99A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.  
    1010 
    11 Each 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].  
     11Each data layer maintains a list of unresolved conflicts in the [wiki:/Help/Dialog/ConflictList Conflict List Dialog]. In this dialog you can launch a [wiki:/Help/Dialog/Conflict dialog for resolving a conflict].  
    1212 
    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'''.  
    … …  
    3939 
    4040== Resolving conflicts == 
    41 Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialogs/ConflictListDialog Conflict List Dialog].  
    42 For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/ConflictDialog Conflict Resolution Dialog] and resolve it. 
     41Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wiki:/Help/Dialog/ConflictList Conflict List Dialog].  
     42For each '''conflict''' listed there you can (and should) launch the [wiki:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it. 
    4343 
    4444Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of unresolved conflicts is empty.  
    … …  
    5050== See also == 
    5151 
    52  * [wiki:/Help/Dialogs/ConflictListDialog Conflict List Dialog] - displays the list of conflicts in the current data layer  
    53  * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - you can use the conflict dialog to resolve a conflict  
     52 * [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer  
     53 * [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict  
    5454 
    5555----