docs/src/resolve-conflicts.md@928a77ebe0b9
docs/src/resolve-conflicts.md
Sat, 07 Sep 2019 19:25:51 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 07 Sep 2019 19:25:51 +0200
- changeset 639
- 928a77ebe0b9
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix that file uploads are tried, when the content on the server is equal to the local file content (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.
