docs/src/resolve-conflicts.md@2dc61cc5a8ac
docs/src/resolve-conflicts.md
Mon, 09 Oct 2017 14:55:47 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Mon, 09 Oct 2017 14:55:47 +0200
- changeset 329
- 2dc61cc5a8ac
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds error message to dav, when an invalid date format is specified for the -u option
--- 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.
