Changes between Version 19 and Version 20 of Help/Concepts/Conflict


Ignore:
Timestamp:
2010-05-03T20:02:09+02:00 (16 years ago)
Author:
skyper
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v19 v20  
    11[[TranslatedPages]]
     2[[TOC(inline)]]
    23= Conflict =
    34
    … …  
    1112
    1213'''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'''.
    13 
    14 [[TOC(inline)]]
    1514
    1615== Conflicts when downloading/updating == #WarningAboutDetectedConflicts