docs/src/resolve-conflicts.md@d24de29ad1fe
docs/src/resolve-conflicts.md
Fri, 30 May 2025 18:31:32 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 30 May 2025 18:31:32 +0200
- changeset 872
- d24de29ad1fe
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix memory management in hashing 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.
