docs/src/resolve-conflicts.md@8f9dbd755fdb
docs/src/resolve-conflicts.md
Wed, 24 Jun 2026 20:26:58 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 24 Jun 2026 20:26:58 +0200
- branch
- dav-2
- changeset 915
- 8f9dbd755fdb
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add functions for getting the current DavSession error
--- 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.
