docs/src/resolve-conflicts.md@30d484806c2b
docs/src/resolve-conflicts.md
Sun, 17 Dec 2023 15:33:50 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 17 Dec 2023 15:33:50 +0100
- changeset 800
- 30d484806c2b
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix faulty string to int conversion utilities
Probably it was expected that errno is set to EINVAL when illegal characters are encountered. But this is not standard and does not happen on every system, allowing illegal strings to be parsed as valid integers.
--- 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.
