docs/src/resolve-conflicts.md@5b8643cf0a2f
docs/src/resolve-conflicts.md
Tue, 17 Sep 2019 21:06:03 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 17 Sep 2019 21:06:03 +0200
- changeset 643
- 5b8643cf0a2f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implement hash push strategy and add some tests
--- 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.
