(2) Example of branching and merging in derived development Change set when Product A1 is released DELETEME Branch name: Product A1 Main Branch for Product A1 Branch name: Fix Bug 12345 (Developer A) Branch for correcting defect #12345 of Product A1 Branch name: Product A2 (Developer B) Branch for A2 which is a derived product of Product A1 As shown in above figure, when you develop A2 which is a derivative product of product A1, create a branch Product A2 from the change set of branch Product A1 at the time of product release.
When a problem occurs in product A1 and it is necessary to modify the project, create a branch Fix Bug 12345 for defect correction from the change set at the time of product A1 release. When quality is secured in the branch, merge it to the original branch Product A1 . If it is necessary to apply this modification not only to Product A1 but also to Product A2, you can apply the changes in the branch Fix Bug 12345 all together to the branch Product A2 . Merge the change set of branch for Product A1 after merging fix bug branch into the branch of Product A2. Sysmac Studio Project Version Control Function Startup Guide (P125) 51