dav: docs/src/resolve-conflicts.md@5577d3eae04c (annotated)

docs/src/resolve-conflicts.md@5577d3eae04c (annotated)

docs/src/resolve-conflicts.md

Fri, 04 Aug 2017 20:03:21 +0200

author: Olaf Wintermann <olaf.wintermann@gmail.com>
date: Fri, 04 Aug 2017 20:03:21 +0200
changeset 274: 5577d3eae04c
parent 273: c743721d566f
child 282: 3070d72f54af
permissions: -rw-r--r--

dav-sync command documentation complete

 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.