Patent ID: 11900082
Assignee: ROCKWELL AUTOMATION TECHNOLOGIES, INC.
Field: Computer technology (Electrical engineering)
Classification: CPC G | IPC G

Claim 0:
1. A system, 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, a first edit record 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 first edit record:
determine whether the first edit record conflicts with a second edit record defining second modifications made 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,
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, and

in response to determining, based on application of the one or more conflict resolution rules, that the first edit record is to be applied instead of the second edit record:
roll back the second modifications from the master version of the system project data,
apply the first modifications to the master version of the system project data,
store the first edit record in association with the master version of the system project data as an applied edit record, and
store the second edit record in association with the master version of the system project data as an unapplied edit record.