How CmisSync handles conflicts - aegif/CmisSync GitHub Wiki

Scenario:

1. Both UserA and UserB synchronize the file logo.png.
2. Both UserA and UserB go offline, and edit logo.png while offline.
3. UserA goes back online. CmisSync uploads UserA's version of logo.png to the server.
4. UserB goes back online. CmisSync tries to uploads UserB's version of logo.png to the server, but realizes that the file has been updated by UserA already.
5. On UserB's computer, CmisSync renames UserB's logo.png to logo.png_UserB-version and downloads UserA's logo.png.
6. UserB now has the two versions, and must perform one of the following actions: a: Keep UserA's version: Delete logo.png_UserB-version and keep UserA's logo.png b: Keep UserB's version: Delete UserA's logo.png and remove the suffix from logo.png_UserB-version c: Merge content from both into logo.png, then delete logo.png_UserB-version

CmisSync handles file creation conflicts in a similar way.

It is a good idea to solve conflicts as soon as possible. If another conflict happens before the merge is complete, it is handled the same way, with a suffix like _UserB-version (1).

• In most companies, conflicts do not happen often. The probability of conflicts can be decreased considerably by setting up a small sync interval. Aegif can provide you with a customized CmisSync installer with out-of-the-box settings adapted to your company.