docs/src/resolve-conflicts.md@125b9c976f39
docs/src/resolve-conflicts.md
Thu, 28 Dec 2017 15:30:23 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 28 Dec 2017 15:30:23 +0100
- changeset 360
- 125b9c976f39
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes bsd config
dav uses the base system openssl because curl seems to use it as well
--- 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.
