docs/src/resolve-conflicts.md@92fcd6a8cf9e
docs/src/resolve-conflicts.md
Wed, 01 Jul 2026 21:09:22 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 01 Jul 2026 21:09:22 +0200
- branch
- dav-2
- changeset 920
- 92fcd6a8cf9e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
make some string property function ns/name args const
--- 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.
