Resolving conflicts during synchronization of document objects

A system (SY1) comprising first and second devices (DV1, DV2) configured to cooperate with a cloud (CL), for synchronizing different versions (DO1, DO2) of a document object, wherein each version of said document object comprises at least one content file and one object descriptor file, said content file comprising a content and said object descriptor file comprising at least one object descriptor defining said content, wherein said object descriptor file comprises a version history, said first and second devices comprising modules for performing the method of storing (S10) a first version of the document object comprising a first version (CF1) of the content file and a first version (ODF1) of the object descriptor file, said first version of the object descriptor file comprising a first version history (H1) defining at least one previous version of said document object on which basis the first version of the document object has been created;

• retrieving a second version history (H2) comprised in a second version (ODF2) of the object descriptor file currently stored as part of a second version of the document object in the cloud, said second version history defining at least one previous version of said document object on which basis the second version of the document object has been created;
• performing a comparison of the first and second version histories (H1, H2) to determine whether any of the first and second versions (DO1, DO2) of the document object originates from the other;
• if it is detected, based on the comparison of the first and second version histories (H1, H2), that the first version (DO1) of the document object originates from the second version (DO2) of the document object while the second version (DO2) of the document object does not originate from the first version (DO1) of the document object, sending the first version (CF1) of the content file to the cloud, independently of the first version of the object descriptor file, to cause the cloud to store said first version of the content file;
• determining a first unique identifier (CID1) which is stored by the cloud (CL) in association with the first version (CF1) of the content file;
• retrieving a unique identifier (CID2) currently stored in the cloud (CL) in association with a version of the content file;
• detecting a file mismatch conflict if the retrieved unique identifier (CID2) does not match the first unique identifier (CID1);
• and
• resolving the file mismatch conflict by sending the first version (CF1) of the content file for causing said cloud (CL) to re-store said first version of the content file.

A non-transitory storage medium carrying instructions of program code for executing the method of:

• storing (S10) a first version of the document object comprising a first version (CF1) of the content file and a first version (ODF1) of the object descriptor file, said first version of the object descriptor file comprising a first version history (H1) defining at least one previous version of said document object on which basis the first version of the document object has been created;
• retrieving a second version history (H2) comprised in a second version (ODF2) of the object descriptor file currently stored as part of a second version of the document object in the cloud, said second version history defining at least one previous version of said document object on which basis the second version of the document object has been created;
• performing a comparison of the first and second version histories (H1, H2) to determine whether any of the first and second versions (DO1, DO2) of the document object originates from the other;
• if it is detected, based on the comparison of the first and second version histories (H1, H2), that the first version (DO1) of the document object originates from the second version (DO2) of the document object while the second version (DO2) of the document object does not originate from the first version (DO1) of the document object, sending the first version (CF1) of the content file to the cloud, independently of the first version of the object descriptor file, to cause the cloud to store said first version of the content file;
• determining a first unique identifier (CID1) which is stored by the cloud (CL) in association with the first version (CF1) of the content file;
• retrieving a unique identifier (CID2) currently stored in the cloud (CL) in association with a version of the content file;
• detecting a file mismatch conflict if the unique identifier (CID2) retrieved does not match the first unique identifier (CID1);
• and
• resolving the file mismatch conflict by sending the first version (CF1) of the content file for causing said cloud (CL) to re-store said first version of the content file.