docs/src/resolve-conflicts.md@8d40b5ccc43e
docs/src/resolve-conflicts.md
Sat, 28 Mar 2020 16:04:46 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 28 Mar 2020 16:04:46 +0100
- branch
- feature/dav-edit
- changeset 711
- 8d40b5ccc43e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds check for encryption key (otherwise segfault when trying to create a fresh encrypted file without a key)
--- 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.
