docs/src/resolve-conflicts.md@5fe4453fc025
docs/src/resolve-conflicts.md
Wed, 10 Apr 2024 22:07:17 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 10 Apr 2024 22:07:17 +0200
- changeset 812
- 5fe4453fc025
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
make sure a LocalResource path has never a trailing path separator, fixes multiple dav-sync tests
--- 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.
