docs/src/resolve-conflicts.md@5979ea04175e
docs/src/resolve-conflicts.md
Tue, 13 Nov 2018 23:33:59 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 13 Nov 2018 23:33:59 +0100
- changeset 496
- 5979ea04175e
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes dav_session_get_href() generating random names when encrypt-name is disabled
--- 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.
