docs/src/resolve-conflicts.md@55c5d36b82b7
docs/src/resolve-conflicts.md
Thu, 12 Dec 2024 16:46:43 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 12 Dec 2024 16:46:43 +0100
- changeset 851
- 55c5d36b82b7
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix compatibility with older libcurl versions
--- 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.
