docs/src/resolve-conflicts.md@35a421f441d5
docs/src/resolve-conflicts.md
Fri, 04 Jun 2021 18:24:55 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 04 Jun 2021 18:24:55 +0200
- changeset 728
- 35a421f441d5
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add stream API
--- 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.
