diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/resolve-conflicts.html --- a/docs/html/resolve-conflicts.html Sun Dec 15 16:54:05 2019 +0100 +++ b/docs/html/resolve-conflicts.html Sun Dec 15 17:00:46 2019 +0100 @@ -1,12 +1,20 @@ - - + + - - + + dav-sync resolve-conflicts - - + + +
@@ -26,6 +34,7 @@
  • remove
  • copy
  • move
    • +
  • rename
  • export
  • import
  • get-property
    • @@ -35,9 +44,19 @@
  • unlock
  • info
  • date
    • +
  • versioncontrol
    • +
  • list-versions
    • +
  • checkout
    • +
  • checkin
    • +
  • uncheckout
  • add-repository
  • remove-repository
  • list-repositories
    • +
  • repository-url
    • +
  • add-user
    • +
  • remove-user
    • +
  • edit-user
    • +
  • list-users
  • check-config
  • Configuration
    • @@ -53,11 +72,13 @@
  • pull
  • push
  • archive
    • -
  • list-conflicts
    • +
  • restore
    • +
  • list-conflicts
  • resolve-conflicts
  • delete-conflicts
  • trash-info
  • empty-trash
    • +
  • list-versions
  • add-tag
  • remove-tag
  • set-tags
    • @@ -74,9 +95,9 @@
    - +

    dav-sync resolve-conflicts <directory>

    Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that you have resolved the conflicts. Usually you will not need this command.