7.4.3.10 Merge the correction of defects to the branch of Machine B and push it to the remote repository (No.10: Machine A development) Merge modifications to correct defects in Machine A merged into the master to the branch of the Machine B. After merging, consider this as a finished program of the Machine B and apply the tag as "Version 1.0". Then, push this to the remote repository. 1. Switch to the ProductB branch of the Machine B to edit it. For the procedure to switch to the branch to edit, refer to 7.3.3.7 Commit changes of Program A and Global Variables to the working branch (No.8, 9: Developer A) . 2.
To merge the changes to the ProductB branch, right-click the target project in the Version Control Projects window and select TortoiseGit - Merge from the pop-up menu. The “TortoiseGit” Merge dialog box is displayed. Sysmac Studio Project Version Control Function Startup Guide (P125) 119