docs/src/resolve-conflicts.md@51206020cfbe
docs/src/resolve-conflicts.md
Tue, 15 Oct 2019 09:22:57 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Tue, 15 Oct 2019 09:22:57 +0200
- changeset 659
- 51206020cfbe
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix: leaking buffer in upload_parts(), when we error out due to too many parts
--- 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.
