docs/src/resolve-conflicts.md@a1c36a6410f6
docs/src/resolve-conflicts.md
Sat, 28 Mar 2020 16:37:40 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 28 Mar 2020 16:37:40 +0100
- branch
- feature/dav-edit
- changeset 713
- a1c36a6410f6
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
reimplement dav_exists by using dav_load_prop
--- 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.
