docs/src/resolve-conflicts.md@1c995e93bf40
docs/src/resolve-conflicts.md
Sat, 10 Aug 2019 19:54:37 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 10 Aug 2019 19:54:37 +0200
- changeset 617
- 1c995e93bf40
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
change error handling in case of file/folder conflict
--- 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.
