docs/src/resolve-conflicts.md@39fd327f81da
docs/src/resolve-conflicts.md
Sat, 12 May 2018 15:03:11 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 12 May 2018 15:03:11 +0200
- changeset 375
- 39fd327f81da
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes options parser to correctly report missing arguments
--- 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.
