Table of Contents

  • Introduction
  • Content Editor
  • Templates
  • Version Control
    · Introduction
    · Commit
    · Update
    · Log & Annotate
    · Download Files for Editing
    · Discard - Edit Area
  • Work Areas
  • Access Control
  • Editing Using Other Clients
  • Update
    If you are editing a file and another user commits modifications of the file while the file is still in your edit area, a symbol will be shown indicating a conflict between the copy in your edit area and the one in the repository, see figure below. Before you can commit your changes you must update the file with the latest version in the repository.


    File indicating conflict

    While updating a file, a number of conflicts and differences may arise, the different types are described under "Conflicts" and "Differences" below.

    Solving conflicts
    To update a file, focus the file and click on Update. By clicking Next the wizard searches for conflicts between the copy in your edit area and the one in the repository.

    If a directory is focused, the Update wizard will present you with a file listing where you can select the files to be updated. After selecting the files you want to update, click on Next to continue to the File status summary which gives you the present status of each file selected.

    If the wizard finds several files with conflicts, each file has to be resolved separately before they can be updated. To resolve a conflict, click on the arrow to the left of the file name. Files who only contain differences and no conflicts do not need resolving but can be updated directly.

    Conflicts

    Different content types
    The content types in the files are different. This conflict must be solved before any of the other conflicts can be handled, because the methods used for solving conflicts depend on the content type of the file. When a content type conflict is resolved, another conflict might arise that is due to something else.
    Unresolved conflicts
    The same part is changed in both files.

    Differences

    Conflict-free differences
    For instance:
  • New data is added.
  • Old data is removed.
  • Old data is replaced by new data.
  • Status

    No differences
    Both files are identical.

    Resolved conflicts
    All conflicts are solved.

    Removed from site
    File or directory is removed from the site.

    Actions

    Add your file
    Your file will replace the current version in the repository. The replaced version will still be available due to the version control system.

    Discard your file
    Remove your file from the edit area. All your changes will be lost permanently.

    Navigation help
    To help the user navigate the wizard, words and different colors have been used to represent different aspects:

    Red
    Represents a conflict. Is found in the text to highlight a conflict and to the left in the wizard.

    Green
    Represents your edit area. Text on green background does only exist in your edit area.

    Blue
    Represents the site repository. Text on blue background has been added by another user and does not exist in your edit area.

    Gray
    Represents old value or content. When defined as old, it is not considered to be a conflict, only a difference between the files.

    Old
    The word Old is set beside an unselected radio button. It is always represented by gray color.

    Del
    The word Del is set beside an unselected radio button. Del implies that the data only exists in one file.

    Radio buttons
    A preselected radio button implies that this is the probable choice a user will make. Select the radio button in front of data you want to keep and the Del button in front of data you want to remove. Data with only an unselected radio button and no Del button in front will be deleted.
    By selecting a file, the wizard takes you to the conflict resolving mode. Here you make the changes in a file necessary to make an update.


    Conflict-free update example

    The image above shows an update situation with only conflict-free differences.

    1. Text added by you.

    2. Text changed by another user.
    The update wizard always assumes you want to keep the latest changes so these radio buttons are preselected. If you would rather keep an old value select the other radio button.


    Update example showing conflict

    This example shows a conflict where two users have changed the same part of the content. You must select the radio button in front of the data you want to keep.

    By selecting radio buttons, the conflicts will be resolved and data removed or added. When all radio buttons are selected, choose Ok to update the file.

    After solving
    If several files need to be updated and not all files are conflict free, an update is still possible since the conflict free files will be updated.

    When all updates are finished, don't forget to commit each file.