diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/list-conflicts.html --- a/docs/html/list-conflicts.html Sun Dec 15 16:54:05 2019 +0100 +++ b/docs/html/list-conflicts.html Sun Dec 15 17:00:46 2019 +0100 @@ -1,12 +1,20 @@ - - + + - - + + dav-sync list-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,12 +95,12 @@
    - +

    dav-sync list-conflicts [-v] <directory>

    Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file.

    -

    For each conflict a backup file with the pattern orig.N.filename has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don't need to do anything more and dav-sync will remove the conflict from the database automatically. You can also use the delete-conflicts command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the resolve-conflicts command to forcefully clear the conflict database.

    +

    For each conflict a backup file with the pattern orig.N.filename has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don’t need to do anything more and dav-sync will remove the conflict from the database automatically. You can also use the delete-conflicts command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the resolve-conflicts command to forcefully clear the conflict database.