docs/src/resolve-conflicts.md@0f1349ffa719
docs/src/resolve-conflicts.md
Tue, 01 Apr 2025 20:30:02 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 01 Apr 2025 20:30:02 +0200
- changeset 856
- 0f1349ffa719
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
remove usage of deprecated libxml2 and curl functions
--- 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.
