Merge changes across streams

Merge operations enable you to view differences, apply changes, and resolve conflicts before delivering the results to a target stream. This section explains how to merge, build, and test changes in streams using the desktop client:

• Merge from one stream to another

• Merge from baseline into stream

• Merge from requests owned by another stream

• Silently merge child stream into mainline

• Merge from baseline or stream version

• Merge changes related to request from another stream

You can use your own tool for automatic and manual merge. For details, see Use custom file merge tool.

See also:

• Merge changes