docs/src/list-conflicts.md@5dc7fe41e8f8
docs/src/list-conflicts.md
Sat, 22 Jun 2019 16:36:52 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 22 Jun 2019 16:36:52 +0200
- changeset 607
- 5dc7fe41e8f8
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move some properties to new namespace
for properties encryption we need to decide which props must be encrypted and the plan is, to decide by namespace
--- 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
