docs/src/resolve-conflicts.md@3070d72f54af
docs/src/resolve-conflicts.md
Sat, 05 Aug 2017 13:35:27 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 05 Aug 2017 13:35:27 +0200
- changeset 282
- 3070d72f54af
- parent 274
- 5577d3eae04c
- child 283
- 0e36bb75a732
- permissions
- -rw-r--r--
more minor improvements to the documentation
dav-sync resolve-conflicts ========================== **`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.
