Sun, 01 Oct 2017 17:37:59 +0200
dav-sync bugfix: files that are not in the db but on the server should not be pushed
--- 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.