docs/src/resolve-conflicts.md@bebe0b436c84
docs/src/resolve-conflicts.md
Thu, 21 Sep 2017 12:53:29 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 21 Sep 2017 12:53:29 +0200
- branch
- v1.0
- changeset 312
- bebe0b436c84
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
dav 1.0.1 update
--- 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.
