docs/src/resolve-conflicts.md@b0eb645cd26e
docs/src/resolve-conflicts.md
Sun, 08 Aug 2021 14:40:26 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Aug 2021 14:40:26 +0200
- changeset 732
- b0eb645cd26e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix error in dav add-user, if .dav dir doesn't exists
--- 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.
