docs/src/resolve-conflicts.md@d479b5e25b6e
docs/src/resolve-conflicts.md
Sun, 17 Dec 2023 15:22:34 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 17 Dec 2023 15:22:34 +0100
- changeset 799
- d479b5e25b6e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix missing cmd_add_directory() implementation after ucx upgrade
--- 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.
