Integrating files

To create a new codeline (also called branching) or propagate a bug fix or new feature from one codeline to another, you integrate the required files to the target codeline. To integrate files, you open them for integration, specifying source and target, and submit the changelist containing the open files.

If you are integrating changes into an existing codeline, you are required to resolve the files to ensure that you do not overwrite other users' changes and to preserve the file's revision history. For details about resolving, see Resolving files. Typical steps are:

  1. Open files for integration.
  2. Submit the changelist.
  3. If there are conflicts, resolve the files.
When you open files for integration, you can specify the mapping of source to target using either a file specification or a branch specification. To open files for integrate: context-click the file and choose Integrate... The Integrate dialog is displayed. Specify integration options as follows: To integrate using a branch specification: display the Branch Specification pane, context-click the desired branch specification, and choose Integrate Using Branch 'branch_specification'....