docs/src/resolve-conflicts.md@d684ba9e2da0
docs/src/resolve-conflicts.md
Fri, 09 Jan 2026 14:52:34 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 09 Jan 2026 14:52:34 +0100
- branch
- dav-2
- changeset 897
- d684ba9e2da0
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add tests for some path util functions
--- 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.
