18. Click the Apply button, and then click the Back button. The Sysmac Diff dialog box appears again. 19. Make sure there is no other conflict (with purple bar) and click the Close button. When the project is opened, you can find, in the working branch ProgramB_work , the variable P1_Input2 which was registered by Developer A. The conflict was resolved and changes made by Developer A and B were successfully merged. 20. Next, commit the changes (merge result) to the local repository. Right-click the folder icon in the Multiview Explorer and select Git Commit -> “ProgramB_work” from the pop-up menu.
When the project is not yet saved, a confirmation dialog box is displayed to ask if you need to save the project. Click the Yes button. The following dialog box is displayed with the “TortoiseGit” Commit dialog box. 90 Sysmac Studio Project Version Control Function Startup Guide (P125)