docs/src/resolve-conflicts.md@119197afb22d
docs/src/resolve-conflicts.md
Thu, 29 Jan 2026 21:47:31 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 29 Jan 2026 21:47:31 +0100
- branch
- dav-2
- changeset 907
- 119197afb22d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix test_dav_store_load_webdav in case encryption is enabled
--- 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.
