docs/src/resolve-conflicts.md@1e3e374d9386
docs/src/resolve-conflicts.md
Thu, 31 Aug 2017 13:10:55 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 31 Aug 2017 13:10:55 +0200
- changeset 290
- 1e3e374d9386
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds clean handling in case the stack of dav_exec_expr() runs out of memory
--- 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.
