docs/src/resolve-conflicts.md@1e60f78705d4
docs/src/resolve-conflicts.md
Mon, 19 May 2025 22:56:44 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 19 May 2025 22:56:44 +0200
- changeset 868
- 1e60f78705d4
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
update dependency install command for EL/Fedora in the install instructions
--- 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.
