docs/src/resolve-conflicts.md@bbc66c72661a
docs/src/resolve-conflicts.md
Sat, 15 Jun 2019 11:01:37 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 15 Jun 2019 11:01:37 +0200
- changeset 605
- bbc66c72661a
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add new api for encrypted properties
--- 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.
