docs/src/resolve-conflicts.md@2465dd550bb5
docs/src/resolve-conflicts.md
Tue, 26 Feb 2019 10:40:23 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Tue, 26 Feb 2019 10:40:23 +0100
- changeset 515
- 2465dd550bb5
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes signedness of salt in dav_pw2key()
--- 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.
