docs/src/resolve-conflicts.md@cece9ef3547f
docs/src/resolve-conflicts.md
Sun, 25 May 2025 19:12:39 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 25 May 2025 19:12:39 +0200
- changeset 869
- cece9ef3547f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
use cxMempoolCreateSimple instead of cxMempoolCreate
--- 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.
