docs/src/resolve-conflicts.md@0f4c59ac8c74
docs/src/resolve-conflicts.md
Thu, 03 Oct 2019 12:00:25 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 03 Oct 2019 12:00:25 +0200
- changeset 649
- 0f4c59ac8c74
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implement hash based conflict resolution in dav-sync pull
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that *you* have resolved the conflicts. Usually you will not need this command.
