docs/src/resolve-conflicts.md@c949c6ab5346
docs/src/resolve-conflicts.md
Thu, 28 Nov 2024 17:20:19 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 28 Nov 2024 17:20:19 +0100
- changeset 849
- c949c6ab5346
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix crash in printxmldoc, fixes #514
--- 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.
