docs/src/resolve-conflicts.md@82275f589d8d
docs/src/resolve-conflicts.md
Sun, 17 Sep 2017 16:36:45 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 17 Sep 2017 16:36:45 +0200
- changeset 308
- 82275f589d8d
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds test for crypto streams
--- 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.
