docs/src/list-conflicts.md@a93374f1849a
docs/src/list-conflicts.md
Sun, 11 Aug 2019 08:58:58 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 11 Aug 2019 08:58:58 +0200
- changeset 620
- a93374f1849a
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add additional dav-sync push test to check if deleting all files will result in an empty collection
--- title: 'dav-sync list-conflicts' --- **`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][1] command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the [resolve-conflicts][2] command to forcefully clear the conflict database. [1]: ./delete-conflicts.html [2]: ./resolve-conflicts.html
