To merge versions during the deliver operation (Windows)

During the deliver operation on a Windows system, after selecting activities, click OK in the Deliver from Stream Preview window to start merging versions in your development view with versions in the integration view. As files and directories are being merged, the progress indicator opens in the Delivering to View window.

For each new version delivered to the integration view, all nonconflicting differences are merged.

As it merges versions, the value in the Merged column of the Delivering to View window is changed to Yes.

If versions in your development view contain changes that conflict with the corresponding versions in the integration view, the value in the Merged column shows No.

If the file is a text file, Diff Merge starts so that you can resolve conflicting differences.

If the file is an XML type, XML Diff Merge starts.