docs/src/resolve-conflicts.md@0b03aa8fb838
docs/src/resolve-conflicts.md
Tue, 12 Dec 2017 23:36:47 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Tue, 12 Dec 2017 23:36:47 +0100
- branch
- v1.1
- changeset 342
- 0b03aa8fb838
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes a segfault when full encryption is requested during a put without specifying the key
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. In other words: by executing this command you assert that *you* have resolved the conflicts.
