docs/src/resolve-conflicts.md@ce253cfb9127
docs/src/resolve-conflicts.md
Wed, 04 Dec 2019 15:48:58 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 04 Dec 2019 15:48:58 +0100
- changeset 690
- ce253cfb9127
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix aes encrypter stream (cng)
--- 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.
