After merging, switch the branch you work on to the main branch and then merge the data after resolving conflicts to the main branch. This completes the merge processing. 1. Right-click the target project in the Version Control Projects window and select TortoiseGit - Switch/Checkout from the pop-up menu. The “TortoiseGit” Switch/Checkout dialog box is displayed. 2. Select Branch option, then master (main branch), and click the OK button. 82 Sysmac Studio Project Version Control Function Startup Guide (P125)