docs/src/resolve-conflicts.md@fa48ab29abd2
docs/src/resolve-conflicts.md
Sat, 05 Aug 2017 09:36:03 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 05 Aug 2017 09:36:03 +0200
- changeset 275
- fa48ab29abd2
- parent 274
-
5577d3eae04c
- child 282
-
3070d72f54af
- permissions
- -rw-r--r--
adds more details to add-directory.md
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.