Changes between Version 12 and Version 13 of Help/Dialog/Conflict


Ignore:
Timestamp:
2019-12-27T12:19:01+01:00 (6 years ago)
Author:
leni
Comment:

add #Resolvingdifferencesbetweentags

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v12 v13  
    77[[Image(conflict-dialog.png)]]
    88
    9 == Resolving differences between tags ==
     9== Resolving differences between tags ==#Resolvingdifferencesbetweentags
    1010If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a [[Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts.
    1111