docs/src/resolve-conflicts.md@6d8784bee427
docs/src/resolve-conflicts.md
Sat, 05 Aug 2017 11:08:34 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 05 Aug 2017 11:08:34 +0200
- changeset 280
- 6d8784bee427
- parent 274
- 5577d3eae04c
- child 282
- 3070d72f54af
- permissions
- -rw-r--r--
fixes dav_resource_new_full
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.
