UNIXworkcode

1 --- 2 title: 'dav-sync list-conflicts' 3 --- 4 5 **`dav-sync list-conflicts [-v] <directory>`** 6 7 Lists all conflicting files. If verbose output is enabled, the output also 8 shows the number of entries for the same conflicting file. 9 10 For each conflict a backup file with the pattern `orig.N.filename` has been 11 created. 12 You can resolve the conflict by either deleting the backup, or replacing the 13 conflicting file with the backup. 14 In either case you don't need to do anything more and `dav-sync` will remove 15 the conflict from the database automatically. 16 You can also use the [delete-conflicts][1] command to bulk-delete all backups 17 (in case you want to proceed with the upstream version of your files) or the 18 [resolve-conflicts][2] command to forcefully clear the conflict database. 19 20 [1]: ./delete-conflicts.html 21 [2]: ./resolve-conflicts.html 22