The following figure illustrates the relationship between the repositories and branches. The changes in the main branch of the local repository of each developer's computer are exchanged through the remote repository. On the local repository of each developer, a working branch is created and the changes are merged. The numbers next to ◯ in the figure correspond to the task numbers of Developers A and B shown in the above table.
Remote Repository 1 6 11 13 Developer A Local Repository Main Branch ( master ) 3,4, 10 Working branch ( ProgramA_work ) 5 7 8,9 Developer B Local Repository 12 Main Branch ( master ) 7 12 12 Working branch ( ProgramB_work ) 7 8,9 7.3.3 Operating Procedure This section explains the operating procedure along with the description in 7.3.2.2 Scenario . 7.3.3.1 Register a project in the remote repository (No.1: Developer A) 1. Creating a remote repository Create a remote repository to share with multiple developers. Here, create a remote repository with the folder name "C: \ Git \ MachineA.git" on Developer A's computer. Refer to 5.6 Creating the shared folder and remote repository for details.
2. Registering the local repository and creating and saving the base project Create a new project and register it in the local repository. Here, create a project “MachineA” in the Developer A’s computer, commit it to the local repository, and then push it to the remote repository. Refer to 6.3 Preparing for Starting Project Control (Creating a Base Project and Saving It) for details. 7.3.3.2 Load the project from the remote repository (No.2: Developer A) After the project is registered in the remote repository, there is a possibility that other developers are updating the target project of the remote repository.
In order to synchronize the local repository in the Developer A’s computer with the remote repository which functions as the master, take the following steps. Sysmac Studio Project Version Control Function Startup Guide (P125) 55