docs/src/resolve-conflicts.md@d87fbe697f9b
docs/src/resolve-conflicts.md
Sat, 10 Jan 2026 19:51:20 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 10 Jan 2026 19:51:20 +0100
- branch
- dav-2
- changeset 898
- d87fbe697f9b
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add test_util_resource_name
--- 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.
