docs/src/resolve-conflicts.md@f0d7178043c1
docs/src/resolve-conflicts.md
Sat, 25 Mar 2023 17:23:09 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 25 Mar 2023 17:23:09 +0100
- changeset 744
- f0d7178043c1
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
force mkcol for every directory in the dav put command
--- 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.
