docs/src/resolve-conflicts.md@84fbdc541752
docs/src/resolve-conflicts.md
Wed, 05 Sep 2018 07:02:04 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 05 Sep 2018 07:02:04 +0200
- branch
- v1.2
- changeset 463
- 84fbdc541752
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
aes encrypter: fixes case where EVP_EncryptFinal_ex was not called at the stream end
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. In other words: by executing this command you assert that *you* have resolved the conflicts.
