docs/src/resolve-conflicts.md@5dfbf7b45873
docs/src/resolve-conflicts.md
Thu, 21 Dec 2017 16:48:58 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 21 Dec 2017 16:48:58 +0100
- changeset 357
- 5dfbf7b45873
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implements parser for Assignments (previously called SetExpressions) + improves davql debugger regarding DavQLField
Note: we renamed SetExpressions to Assignments so that they are not confused with expressions on sets of elements
--- 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.
