Conflict Cases

Conflicts in Open Bee™ Sync appear when a file is modified on the server and the corresponding file is modified locally between synchronizations.
To explain the notion of conflict, we will consider the following tree structure for synchronized folders :

– Company 1
–  Company 2
–  Society 3

Conflict Cases

  1. File created locally ; A file created on the server with the same name and in the same folder as the local file.
  2. Recreated file (deleted and dropped another one with the same name) locally ; Modified matching file on the server
  3. Recreated file (deleted and dropped another one with the same name) locally ; Matching file deleted from the server
  4. Recreated file (deleted and dropped another one with the same name) locally ; Matching file is deleted, another file is renamed to the corresponding folder on the server with the same name as the local file
  5. Recreated file (deleted and dropped another one with the same name) locally ; File is deleted, a file with the same name is moved to the corresponding folder on the server
  6. File modified locally ; Matching file recreated (deleted and re-uploading another file with the same name) to the server
  7.  File modified locally ; Modified matching file on the server
  8. File modified locally ; Matching file deleted from the server
  9. File modified locally ; Matching file is deleted, another file is renamed to the corresponding folder on the server with the same name as the local file
  10. File modified locally ; File is deleted, a file with the same name is moved to the corresponding folder on the server
  11. Locally deleted  file; Matching file deleted on the server, another file is created with the same name as the old one
  12. Locally deleted  file; Modified matching file on the server
  13. Locally deleted  file; Matching file is deleted, another file is renamed to the corresponding folder on the server with the same name as the local file
  14. Locally deleted  file; Matching file is deleted, another file is moved to the corresponding folder on the server, the file has the same name as the file locally
  15. File renamed to local; Matching file recreated (deleted and re-uploading another file with the same name) to the server
  16. File renamed to local; Modified matching file on the server
  17. File renamed to local; Matching file deleted from the server
  18. File renamed to local; Matching file is deleted, another file is renamed to the corresponding folder on the server with the same name as the local file
  19. File renamed to local; Matching file is deleted, another file is moved to the corresponding folder on the server, the file has the same name as the file locally
  20. File modified locally ; Matching file renamed on the server, the same file that had the same name as the one locally
  21. File unchanged locally ; Matching file deleted from the server, another renamed file with the same name but different content is dropped in the corresponding folder on the server
  22. File unchanged locally ; Matching file deleted from the server, another file with the same name but different content is moved to the corresponding folder on the server