docs/src/resolve-conflicts.md@06fa328989ee
docs/src/resolve-conflicts.md
Sat, 24 Jan 2026 13:56:19 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 24 Jan 2026 13:56:19 +0100
- branch
- dav-2
- changeset 902
- 06fa328989ee
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
integrate wsgidav into test suite
--- 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.
