Industrial automation multi-developer control code synchronization

A method comprising:

• maintaining, on a system that executes on a cloud platform and comprises a processor, a master version of system project data that, in response to execution on one or more industrial devices, facilitates monitoring and control of an industrial automation system;
• and
• in response to receiving, by the system from a first client device, a first edit record defining first modifications performed on a first version of the system project data that is stored locally on the first client device:
• determining, by the system, whether the first modifications conflict with a second edit record defining second modifications performed on a second version of the system project data that is stored locally on a second client device, and which have been applied to the master version of the system project data, and
• in response to determining that the first edit record conflicts with the second edit record:
• selecting, by the system based on application of one or more conflict resolution rules, one of the first edit record or the second edit record to be applied to the master version of the system project data;
• and
• in response to determining, based on the application of the one or more conflict resolution rules, that the first edit record is to replace the second edit record:
• undoing, by the system, the second modifications from the master version of the system project data,
• applying, by the system, the first modifications to the master version of the system project data,
• storing, by the system, the first edit record in association with the master version of the system project data as an applied edit record, and
• storing, by the system, the second edit record in association with the master version of the system project data as an unapplied edit record.

A non-transitory computer-readable medium having stored thereon instructions that, in response to execution, cause a system comprising a processor and executing on a cloud platform to perform operations, the operations comprising:

• maintaining, on the cloud platform, a master version of system project data that, in response to execution on one or more industrial devices, facilitates monitoring and control of an industrial automation system;
• and
• in response to receiving, from a first client device, a first edit record defining first edits applied a first version of the system project data that is stored locally on the first client device:
• determining whether the first edits conflict with a second edit record defining second edits applied to a second version of the system project data that is stored locally on a second client device, and which have been applied to the master version of the system project data, and
• in response to determining that the first edit record conflicts with the second edit record:
• selecting, based on application of one or more conflict resolution rules, one of the first edit record or the second edit record to be applied to the master version of the system project data;
• and
• in response to determining, based on the application of the one or more conflict resolution rules, that the first edit record is to replace the second edit record:
• undoing the second modifications from the master version of the system project data,
• applying the first modifications to the master version of the system project data,
• storing the first edit record in association with the master version of the system project data as an applied edit record, and
• storing the second edit record in association with the master version of the system project data as an unapplied edit record.