docs/src/resolve-conflicts.md@7110b37f2a6b
docs/src/resolve-conflicts.md
Sun, 17 Sep 2023 11:21:31 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 17 Sep 2023 11:21:31 +0200
- changeset 790
- 7110b37f2a6b
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav_context_destroy
--- 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.
