docs/src/resolve-conflicts.md@bacb54502b24
docs/src/resolve-conflicts.md
Thu, 21 Dec 2017 19:48:27 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 21 Dec 2017 19:48:27 +0100
- changeset 359
- bacb54502b24
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
davql: allow ANYWHERE keyword in SELECT statements
This may seem pointless, but users might want to be explicit about this and the grammar is more consistent.
This commit also adds some no-ops to the functions body of the SET parser, because some day the grammar might allow more clauses after the WHERE clause.
--- 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.
