docs/src/list-conflicts.md@8e7e56cfc103
docs/src/list-conflicts.md
Sat, 26 Oct 2019 12:38:33 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 26 Oct 2019 12:38:33 +0200
- changeset 673
- 8e7e56cfc103
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds support for quotes in dav bash completion
* add: url2repo_s()
* add: util_url_base_s()
* change: url2repo() is now wrapper for url2repo_s()
* change: util_url_base() is now wrapper for util_url_base_s()
--- 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
