7.3 Sysmac Studio Project Development by Multiple Developers This section describes how to develop the Sysmac Studio project concurrently by multiple developers, example of sharing the development works and operation procedure. 7.3.1 Sharing Edit Works to Concurrently Develop a Project by Multiple Developers The version control function has a feature to help multiple developers to edit one project concurrently and to combine their changes when they “Push” their changes to the remote repository. However, if multiple developers edit the same portion at the same time and try to merge the changes, a conflict occurs and merging fails.
To avoid this problem, a specific developer edits the data which does not support the development by multiple developers (“No” in below table), and data which allows multiple developers to edit (“Yes” in below table) can be edited by multiple developers. 52 Sysmac Studio Project Version Control Function Startup Guide (P125) Data name Edit by multiple developers EtherCAT No CPU/Expansion Racks No I/O Map No Controller Setup No Axis Settings No Axes Group Settings No Cam Data Settings No Event Settings No Task Settings No Programs Yes Functions Yes Function Blocks Yes Data Types No Global Variables No