Mercurial > hg > dav / file diff

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/src/list-conflicts.md	Wed Apr 10 13:50:24 2019 +0200
@@ -0,0 +1,21 @@
+---
+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