docs/src/resolve-conflicts.md@b41630ecc481
docs/src/resolve-conflicts.md
Wed, 07 Feb 2024 17:11:55 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 07 Feb 2024 17:11:55 +0100
- changeset 807
- b41630ecc481
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add support for progress callbacks in dav_store()
--- 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.
