docs/src/resolve-conflicts.md@40be8db6fe45
docs/src/resolve-conflicts.md
Mon, 09 Aug 2021 17:22:21 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 09 Aug 2021 17:22:21 +0200
- changeset 736
- 40be8db6fe45
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav-sync push creating finfo elements without using the mempool, which could lead to crashes
--- 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.
