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


Ignore:
Timestamp:
2024-09-10T15:02:48+02:00 (11 months ago)
Author:
DiGro
Comment:

small typo corrected

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v19 v20  
    4747There are three tables displayed in this dialog, from left to right:
    4848* **My version**:  shows the tags of the first object version participating in this conflict. These are usually the tags of the object version in your local data set.
    49 * **Merged version**: shows the final tags. This table is initially empty. The more tag conflicts you resolve, the more tag values will we be displayed in this table.
     49* **Merged version**: shows the final tags. This table is initially empty. The more tag conflicts you resolve, the more tag values will be displayed in this table.
    5050* **Their version**: shows the tags of the second object version participating in this conflict. These are usually the tags of the object version currently stored on the server.
    5151