Set tip conflict options

Set the tip conflict options to determine what action Dimensions CM takes when you check in items that have conflicting item revisions.

To set the tip conflict options:

  1. In the desktop client, select Tools > Preferences.

  2. In the Preferences dialog box, select the Tip Conflict Options tab.

  3. Specify the following options:

    Option Description
    Check for tip conflicts when checking-in or updating items.

    Select this option to perform a check for branch conflicts when you attempt to check in or update an item.

    Note: This option is preselected and locked if the DM_DISABLE_BRANCH_CHECKINS parameter has been set in the dm.cfg file. For details, see Administration.
    Merge conflicts with my changes and check-in/update the item.

    Select this option to invoke the PVCS Merge Tool. This way, the files are merged to a temporary file and the temporary file is used for the check-in.

    Select Update my local workfile content after merging to overwrite the files in your work area with the resulting temporary merged file after the merge. Clear the option to keep the files in your work area unchanged and discard the temporary file after the check-in.
    Merge conflicts with my workfiles, I’ll check-in/update the item later.

    Select this option to open the default merge tool and overwrite the file in your work area with the merged file, without checking in the file to the repository. This way, you can continue working with the merged file.

    If you attempt to check in or update the file later, the local metatada records that a merge was performed. Dimensions CM checks for any subsequent changes in the repository. If there are no changes, the system checks in or updates the merged file without opening the default merge tool. If there are changes, the merge tool opens.
    Do not perform an interactive merge but check-in/update my changes as the tip. Select this option to check in the file in your work area as the tip revision without opening the default merge tool.
    Ignore the conflict and continue with the check-in/update.

    Select this option to check in the file in your work area as a branch revision without opening the default merge tool.

    Note: This option is not displayed if the DM_DISABLE_BRANCH_CHECKINS parameter has been set in the dm.cfg file. For details, see Administration.
    Perform merge silently Select this option if you do not want the merge tool to be displayed when there are no conflicting lines in the merged files.
    Keep backups made of my workfile(s) prior to merging.

    Select this option to create a backup of your workfile when the content of the workfile is overwritten as a result of the merge.

    The backup copy has the original file name appended with the string ".premerge_<date_time>. For example, the backup for bonus_spec.doc might be bonus_spec.doc.premerge_2007081611_115203.

    Backup copies are created in your temporary file location. They remain there until removed.
    On check-in/update, assume the settings above and do not show the warning dialog.

    Select this option if you do not want the Tip Conflicts dialog box to be displayed when a conflict is detected.

    Leave the option cleared to have the Tip Conflicts dialog box displayed when a tip conflict is detected, which enables to change the options listed under If conflicts are detected, default to.
  4. Click OK.

Back to top

See also: