docs/src/resolve-conflicts.md@ceed7714846a
docs/src/resolve-conflicts.md
Sat, 23 Feb 2019 18:58:53 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 23 Feb 2019 18:58:53 +0100
- changeset 506
- ceed7714846a
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes crash in dav-sync archive command when trying to remove resources from the db
--- 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.
