docs/src/resolve-conflicts.md@271103d11d55
docs/src/resolve-conflicts.md
Fri, 23 Jan 2026 17:38:59 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 23 Jan 2026 17:38:59 +0100
- branch
- dav-2
- changeset 901
- 271103d11d55
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add test_util_parent_path
--- 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.
