Sun, 03 Jun 2018 14:40:07 +0200
more dav documentation
documents -x option for set/get-property
adds documentation for new commands
--- 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.