docs/src/resolve-conflicts.md@0f83fe5e2b07
docs/src/resolve-conflicts.md
Thu, 31 Aug 2017 12:58:06 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 31 Aug 2017 12:58:06 +0200
- changeset 289
- 0f83fe5e2b07
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes local hiding of result variable with uninitialized data in dav_statement_execv
--- 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.
