7.3.2.2 Scenario The Developer A and B work on above mentioned tasks of the project in the procedure of the below table. -: No task 54 Sysmac Studio Project Version Control Function Startup Guide (P125) No. Developer A tasks Developer B tasks Reference for the tasks 1 Register a project in the remote repository *Developer A registers the base project in the repository. - 7.3.3.1 Register a project in the remote repository (No.1: Developer A) 2 Load the project from the remote repository - 7.3.3.2 Load the project from the remote repository (No.2:
Developer A) 3 Configure Configurations and Setup - 7.3.3.3 Commit the project in which Configurations and Setup, Data Types, Global Variables, and program POUs are registered (No. 3,4,5: Developer A) 4 Set the Data Types, Global Variables, and program POUs - 5 Commit the project in which Configurations and Setup, Data Types, Global Variables, and program POUs are registered - 6 Push the changes in the local repository to the remote repository *After this operation, Developer A and B can concurrently edit the project data. - 7.3.3.4 Push the changes in the local repository to the remote repository (No.6:
Developer A) 7 Create the working branch of Developer A in the local repository ･ Copy the target project in the remote repository to the computer of Developer B and create the local repository ･ Create the working branch 7.3.3.6 Create the working branch of Developer A (No.7 Developer A) 7.3.3.5 Create the local repository in the Developer B computer (No.7: Developer B) 7.3.3.9 Create the working branch of Developer B (No.7: Developer B) 8 Develop Program A Add Global Variables Develop Program B Change the initial values of Global Variables 7.3.3.7 Commit changes of Program A and Global Variables to the working branch (No.8, 9:
Developer A) 7.3.3.10 Commits changes of Program B and Global Variables to the branch (No.8, 9: Developer B) 9 Commit changes of Program A and Global Variables to the working branch Commit changes in Program B and Global Variables to the working branch 10 Merge the changes of working branch to the main branch * The project in the local repository created in No,1 is the main branch of Developer A. - 7.3.3.8 Merges the changes of working branch to the main branch (No.10: Developer A) 11 Push the changes in the local repository of Developer A to the remote repository * After this operation, changes made by Developer A and B can be merged.
- 7.3.3.11 Push the changes in the local repository of Developer A to the remote repository (No.11: Developer A) 12 - Obtain the latest data from the main branch and merge it to Developer B’s working branch. Then, remerge the data after merging to the main branch 7.3.3.12 Merges the changes in the working branch of Developer B to the main branch (No.12: Developer B) 13 - Push the changes in the main branch of Developer B from the local repository to the remote repository 7.3.3.13 Push the changes in the main branch of Developer B to the remote repository (No.13: Developer B)