docs/src/resolve-conflicts.md@f9e40f5c6daf
docs/src/resolve-conflicts.md
Sun, 21 Jul 2024 23:19:40 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 21 Jul 2024 23:19:40 +0200
- changeset 822
- f9e40f5c6daf
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav_set_string_property crash if an unknown namespace prefix was specified
--- 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.
