7.2 Branch and Merge A branch represents a series of change record information. At the time of creating and starting to use the repository, there is one branch. However, another branch can be created (branching) from a change set, and the branched project is managed without affecting the change of the original branch. Branch for Product A1 Branch for Product A2 which is a derived product of Product A1 If you use the branches in concurrent development by multiple developers or development for version upgrading, project data can be managed separately so that it does not affect other projects which other developers are editing or ones for already released products.
In development by multiple developers or derived development, changes made in branches may also be applied to the original branch. At this time, we use the function called "merge" that combines the original branch with other branches. (1) Example of branching and merging in concurrent development Branch name: main Product A main branch Branch name: feature a (Developer A) Branch for Product A “requirement a” Branch name: feature b (Developer B) Branch for Product A “requirement b” As shown in the above figure, a branch main is created to be the starting point.
From the main branch, to carry out development for “requirement a” and” b” concurrently, create feature a , a branch for “requirement a” and feature b , a branch for “requirement b”. When development in both branches is completed and satisfactory quality is achieved, merge them to the main branch. 50 Sysmac Studio Project Version Control Function Startup Guide (P125)