docs/src/list-conflicts.md@8f3410b9148f
docs/src/list-conflicts.md
Sat, 12 Oct 2019 18:41:10 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 12 Oct 2019 18:41:10 +0200
- changeset 657
- 8f3410b9148f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add test for testing transition from config without hashing to config with enabled hashing
--- 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
