The data in the main branch is overwritten with the merged data after resolving the conflicts caused by changes of Developer A and B. 29. Click the Close button. 30. Right-click the folder icon in the Multiview Explorer and select TortoiseGit - Show log from the pop-up menu. The “TortoiseGit” Log Messages dialog box is displayed. On the upper pane, you can know that the edits made by Developer B on the working branch PrgramB_work have been merged to the main branch master . Click the OK button to close the dialog box. 7.3.3.13 Push the changes in the main branch of Developer B to the remote repository (No.13:
Developer B) Apply (Push) the changes merged in the Developer B’s computer into the remote repository. 1. Right-click the folder icon in the Multiview Explorer or on the target project in the Version Control Projects window, and select TortoiseGit - Push . Sysmac Studio Project Version Control Function Startup Guide (P125) 95