docs/src/resolve-conflicts.md@12ed560c926c
docs/src/resolve-conflicts.md
Tue, 03 Oct 2017 16:59:39 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 03 Oct 2017 16:59:39 +0200
- changeset 320
- 12ed560c926c
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds documentation for new features
--- 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.
