docs/src/resolve-conflicts.md@8a0c727aa409
docs/src/resolve-conflicts.md
Tue, 29 May 2018 20:15:09 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 29 May 2018 20:15:09 +0200
- changeset 380
- 8a0c727aa409
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds tag filter for dav-sync pull
--- 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.
