docs/src/resolve-conflicts.md@3aed354185eb
docs/src/resolve-conflicts.md
Tue, 13 Nov 2018 20:35:30 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Tue, 13 Nov 2018 20:35:30 +0100
- changeset 494
- 3aed354185eb
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes cmd_mkdir() not verifying the presence of a key + specifying a key with '-k' without requesting encryption is now considered an error
--- 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.
