To merge all changes made on a subbranch
About this task
Complete each of the tasks listed in the merging all changes made on a subbranch scenario.
Procedure
- To prepare a destination view for merging all changes made on a
subbranch:
- Start a dynamic view or change directories to a snapshot view. The view must select the target versions (the latest version on the branch that will contain the results of the merge). In this scenario, the view must select opt.c@@/main/8. (See the figure.) If such a view does not exist, create one.
- If the target versions are checked out to your view for other revisions, create a pre-merge checkpoint by checking them in. To make it easier to find this pre-merge checkpoint, apply a label to the versions in the checkpoint.
- To find changes before merging all changes made on a subbranch:
For example, in the scenario figure, you find elements with versions on the r1_fix subbranch. In your project, several elements might have versions on the r1_fix branch. With the Merge Manager, you can choose for which elements you merge changes from one branch to another.
- To merge all changes made on a subbranch:
- To test and check in merge results:
- In the view that contains your merge results, build and test the results, resolving any build errors.
- When you are satisfied with the build and test results, check in all versions checked out to your view.
- Depending on the complexity of the merge, consider applying a label to this post-merge configuration.