Resolve Merge Conflicts dialog box

Use this dialog box to resolve conflicts between projects, subfolders of projects, or for items related in response to a request, before merging them, or before making a baseline of a particular project.

Field Description Rules and guidelines

Conflicting Project Item Specifications

Select one of the listed items.

 

Resolve

Click to open the Merge Conflicting Item Revisions dialog box.

 

Auto Resolve

Click to launch Serena Merge Tool on the selected item.

Binary items cannot be automatically merged.

Auto Resolve All

Click to launch Serena Merge Tool on all conflicting items.

 

Include items related to sub folders

Select this option if you want to include items in subfolders of the selected folder.

Only displayed if you have selected a subfolder.

Include items related to child requests

Select this option if you want to include items related to child requests of the selected request.

Only displayed if you have selected a request.

Back to top

See also: