This is because Developer A and Developer B made changes in the same global variables and a conflict occurred. 13. Click the Close button. 14. Right-click the target project in the Version Control Projects window and select TortoiseGit - Resolve Conflicted by Preferring Theirs from the pop-up menu. The menu Resolve Conflicted by Preferring Theirs forcibly merges the data with a conflict caused by changes made in the same files. This command prioritizes the changes in merge target data specified in the From section in the “TortoiseGit” Merge dialog box, assuming that changes in the merge source data are invalid. In this example, changes in the master are given priority in merge processing.
In this explanation, a conflict occurred in the Global Variables. If you select Resolve Conflicted by Preferring Theirs menu, merge result is shown on the Sysmac Diff dialog box. Sysmac Studio Project Version Control Function Startup Guide (P125) 87