docs/src/resolve-conflicts.md@d0cccee15a7c
docs/src/resolve-conflicts.md
Fri, 24 May 2024 00:18:18 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 24 May 2024 00:18:18 +0200
- changeset 820
- d0cccee15a7c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix incorrect memory management when loading file parts from the sync db
--- 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.
