Given the ability for multiple individuals to synchronise the same portal folders and files to devices running the Centrastor agent, the potential exists for updates to the same content to be occurring in parallel. In the event of such a file update conflict the following logic is applied.
The last update, as identified by the portal, is always the update reflected in the original file content. Any other update occurring immediately before the last update is saved in a separate file, located in the same folder. So the previous update is not lost. Users must then decided whether to merge the content or otherwise resolve the inconsistency.
For example, if two users are both editing a file called projectx.txt then should a conflict arise a second file will appear with the following syntax, projectx - Conflict On 2015_01_26 11_01_24.txt. Users can see immediately the date and time of a conflict from the file name and work to resolve it.