docs/src/resolve-conflicts.md@8f3410b9148f
docs/src/resolve-conflicts.md
Sat, 12 Oct 2019 18:41:10 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 12 Oct 2019 18:41:10 +0200
- changeset 657
- 8f3410b9148f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add test for testing transition from config without hashing to config with enabled hashing
--- 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.
