docs/src/resolve-conflicts.md@3c917df041b8
docs/src/resolve-conflicts.md
Mon, 22 Apr 2019 12:54:31 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 22 Apr 2019 12:54:31 +0200
- changeset 587
- 3c917df041b8
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add func for creating the content of crypto-prop properties
crypto-prop is a proposed property for storing encrypted properties
create_crypto_prop() is used to create a base64 encoded, encrypted xml document, containing 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.
