docs/src/resolve-conflicts.md@bff983370565
docs/src/resolve-conflicts.md
Thu, 01 Feb 2024 10:41:39 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 01 Feb 2024 10:41:39 +0100
- changeset 805
- bff983370565
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
make DavContext mt-safe
--- 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.
