docs/src/resolve-conflicts.md@3a009658e995
docs/src/resolve-conflicts.md
Sat, 12 Oct 2019 13:42:32 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 12 Oct 2019 13:42:32 +0200
- changeset 656
- 3a009658e995
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
beta1
--- 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.
