docs/src/resolve-conflicts.md@fb466ba2edc5
docs/src/resolve-conflicts.md
Sat, 26 Oct 2019 15:38:50 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 26 Oct 2019 15:38:50 +0200
- changeset 676
- fb466ba2edc5
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
bash completion now handles spaces correctly in both quoted and unquoted strings
--- 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.
