docs/src/resolve-conflicts.md@02ad5db5ad4d
docs/src/resolve-conflicts.md
Tue, 30 Dec 2025 21:27:14 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 30 Dec 2025 21:27:14 +0100
- branch
- dav-2
- changeset 892
- 02ad5db5ad4d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
replace a bunch of cxBufferWrite calls with cxBufferPutString
--- 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.
