A system for collaborative cloud-based development of industrial applications, comprising: a memory configured to store a master version of system project data that, in response to deployment and execution on one or more industrial devices, facilitates monitoring and control of an industrial automation system; and a processor, operatively coupled to the memory that executes executable components stored on the memory, wherein the processor and memory reside on a cloud platform, and the executable components comprise: a user interface component configured to receive, from a first client device (504a-504c), a first edit record (1602a-1602c) defining first modifications made to a first version of the system project data that is stored locally on the first client device; and a collaboration management component configured to, in response to receipt of the edit record: determine whether the first edit record conflicts with a second edit record (1602a-1602c) defining second modifications made to a second version of the system project data that is stored locally on a second client device (504a-504c), and which have been applied to the master version of the system project data, in response to determining that the first edit record does not conflict with the second edit record, apply the first modifications to the master version of the system project data and store the first edit record in association with the master version of the system project data, and the system being characterized by: in response to determining that the first edit record conflicts with the second edit record, apply one or more conflict resolution rules to select between the first edit record and the second edit record for application to the master version of the system project data, wherein the conflict resolution rules comprise selection criteria comprising at least one of: selecting the edit record that is predicted to perform a same function with a least amount of code, and selecting the edits that are predicted to minimize at least one of machine stress, machine downtime, or energy consumption. a memory configured to store a master version of system project data that, in response to deployment and execution on one or more industrial devices, facilitates monitoring and control of an industrial automation system; and a processor, operatively coupled to the memory that executes executable components stored on the memory, wherein the processor and memory reside on a cloud platform, and the executable components comprise: a user interface component configured to receive, from a first client device (504a-504c), a first edit record (1602a-1602c) defining first modifications made to a first version of the system project data that is stored locally on the first client device; and a collaboration management component configured to, in response to receipt of the edit record: determine whether the first edit record conflicts with a second edit record (1602a-1602c) defining second modifications made to a second version of the system project data that is stored locally on a second client device (504a-504c), and which have been applied to the master version of the system project data, in response to determining that the first edit record does not conflict with the second edit record, apply the first modifications to the master version of the system project data and store the first edit record in association with the master version of the system project data, and a user interface component configured to receive, from a first client device (504a-504c), a first edit record (1602a-1602c) defining first modifications made to a first version of the system project data that is stored locally on the first client device; and a collaboration management component configured to, in response to receipt of the edit record: determine whether the first edit record conflicts with a second edit record (1602a-1602c) defining second modifications made to a second version of the system project data that is stored locally on a second client device (504a-504c), and which have been applied to the master version of the system project data, in response to determining that the first edit record does not conflict with the second edit record, apply the first modifications to the master version of the system project data and store the first edit record in association with the master version of the system project data, and determine whether the first edit record conflicts with a second edit record (1602a-1602c) defining second modifications made to a second version of the system project data that is stored locally on a second client device (504a-504c), and which have been applied to the master version of the system project data, in response to determining that the first edit record does not conflict with the second edit record, apply the first modifications to the master version of the system project data and store the first edit record in association with the master version of the system project data, and the system being characterized by: in response to determining that the first edit record conflicts with the second edit record, apply one or more conflict resolution rules to select between the first edit record and the second edit record for application to the master version of the system project data, wherein the conflict resolution rules comprise selection criteria comprising at least one of: selecting the edit record that is predicted to perform a same function with a least amount of code, and selecting the edits that are predicted to minimize at least one of machine stress, machine downtime, or energy consumption.