docs/src/resolve-conflicts.md@38796c7e32b6
docs/src/resolve-conflicts.md
Sun, 17 Sep 2023 12:08:04 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 17 Sep 2023 12:08:04 +0200
- changeset 791
- 38796c7e32b6
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix aes_write on windows could write non-decrypted bytes to output buffer
--- 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.
