docs/src/resolve-conflicts.md@1a9e6a5c1e79
docs/src/resolve-conflicts.md
Tue, 09 Apr 2019 18:19:52 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Tue, 09 Apr 2019 18:19:52 +0200
- changeset 558
- 1a9e6a5c1e79
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes several signedness issues
--- 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.
