docs/src/resolve-conflicts.md@e58dd7fb1a97
docs/src/resolve-conflicts.md
Sun, 20 Apr 2025 13:17:14 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 20 Apr 2025 13:17:14 +0200
- changeset 862
- e58dd7fb1a97
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add util_url_encode_s/util_url_decode_s cxstring variants
--- 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.
