Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
dennis
/
Nextcloud-release
1
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Strom: b6ba1fe0d6
Branche Tagy
Nextcloud-re...
/
doc
/
conflicts.rst

conflicts.rst 2.7 KB
História Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 
  1. =========
    2. 

  2. Conflicts
    3. 

  3. =========
    4. 

  4. 

  5. .. index:: conflicts
    6. 

  6. 

  7. Overview
    8. 

  8. --------
    9. 

  9. 

  10. The Nextcloud desktop client uploads local changes and downloads remote changes.
    11. 

  11. When a file has changed on the local side and on the remote between synchronization
    12. 

  12. runs the client will be unable to resolve the situation on its own. It will
    13. 

  13. create a conflict file with the local version, download the remote version and
    14. 

  14. notify the user that a conflict occured which needs attention.
    15. 

  15. 

  16. Example
    17. 

  17. -------
    18. 

  18. 

  19. Imagine there is a file called ``mydata.txt`` your synchronized folder. It has
    20. 

  20. not changed for a while and contains the text "contents" locally and remotely.
    21. 

  21. Now, nearly at the same time you update it locally to say "local contents" while
    22. 

  22. the file on the server gets updated to contain "remote contents" by someone else.
    23. 

  23. 

  24. When attempting to upload your local changes the desktop client will notice that
    25. 

  25. the server version has also changed. It creates a conflict and you will now have
    26. 

  26. two files on your local machine:
    27. 

  27. 

  28. - ``mydata.txt`` containing "remote contents"
    29. 

  29. - ``mydata (conflicted copy 2018-04-10 093612).txt`` containing "local contents"
    30. 

  30. 

  31. In this situation the file ``mydata.txt`` has the remote changes (and will continue
    32. 

  32. to be updated with further remote changes when they happen), but your local
    33. 

  33. adjustments have not been sent to the server (unless the server enables conflict
    34. 

  34. uploading, see below).
    35. 

  35. 

  36. The desktop client notifies you of this situation via system notifications, the
    37. 

  37. system tray icon and a yellow "unresolved conflicts" badge in the account settings
    38. 

  38. window. Clicking this badge shows a list that includes the unresolved conflicts
    39. 

  39. and clicking one of them opens an explorer window pointing at the relevant file.
    40. 

  40. 

  41. To resolve this conflict, open both files, compare the differences and copy your
    42. 

  42. local changes from the "conflicted copy" file into the base file where applicable.
    43. 

  43. In this example you might change ``mydata.txt`` to say "local and remote contents"
    44. 

  44. and delete the file with "conflicted copy" in its name. With that, the conflict
    45. 

  45. is resolved.
    46. 

  46. 

  47. Uploading conflicts (experimental)
    48. 

  48. ----------------------------------
    49. 

  49. 

  50. By default the conflict file (the file with "conflicted copy" in its name that
    51. 

  51. contains your local conflicting changes) is not uploaded to the server. The idea
    52. 

  52. is that you, the author of the changes, are the best person for resolving the
    53. 

  53. conflict and showing the conflict to other users might create confusion.
    54. 

  54. 

  55. However, in some scenarios it makes a lot of sense to upload these conflicting
    56. 

  56. changes such that local work can become visible even if the conflict won't be
    57. 

  57. resolved immediately.
    58. 

  58. 

  59. In the future there might be a server-wide switch for this behavior. For now it
    60. 

  60. can already be tested by setting the environment variable
    61. 

  61. ``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``.
    62.