Share this page

# Tip Conflicts dialog box

In the Tip Conflicts dialog box, you specify what action to take when you are checking in an item and there are other revisions that need to be merged with it. Then the default merge tool opens, and on completion the specified action is taken.

The Tip Conflicts dialog box is displayed if:

- You have not previously selected Don’t show this message again in this dialog box.

- Your administrator has set the option DM_DISABLE_BRANCH_CHECKINS in the Dimensions CM server's dm.cfg file. For details, see Administration.

- You have set the option Check for tip conflicts when checking-in or updating items in Tools > Preferences > Tip Conflict Options.

Field | Description
--- | ---
Merge my changes and check in now. | Select this option to invoke the Serena Merge Tool and for the merged file(s) to be saved to a temporary file, and for the temporary file to be used for the check in after completing the merge.
Update my workfile content after merging. | If you selected Merge my changes and check in now, select this option to overwrite the files in your work area with the merged files after checking them in. If this option is not set, the files in your work area will remain as they were before the check in/revise and the temporary file will be discarded once the check in is complete.
Merge with my workfiles and check in later | Select this option to overwrite the file in your work area with the merged file, without checking in the merged file to the repository. If you attempt to check in or revise 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 revises 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 my changes as the tip | Select this option to check in the file from your work area as the tip revision without opening the merge tool.
Ignore the conflict and continue with the check-in | Select this option to check in the file from your work area as a branch revision without opening the merge tool. Note: This option is not displayed if your administrator has set the symbol DM_DISABLE_BRANCH_CHECKINS in the dm.cfg file.
Don’t show this message again; always assume my current selection (this can be changed from the Preferences dialog) | Select this option if you do not want this dialog box to be displayed again. You can still change the Tip Conflicts options in Tools > Preferences.

Back to top

See also:

- Check in an item
- Revise an item

https://admhelp.microfocus.com Dimensions CM 8942
Tips to improve your search results... Dimensions CM Help Center CM Help 14.7 All View Local Help Center View Online Help Center Version: