docs/src/resolve-conflicts.md@8e7e56cfc103
docs/src/resolve-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 resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that *you* have resolved the conflicts. Usually you will not need this command.
