docs/src/resolve-conflicts.md@0b61e0164b44
docs/src/resolve-conflicts.md
Thu, 01 May 2025 12:40:00 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 01 May 2025 12:40:00 +0200
- changeset 865
- 0b61e0164b44
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implement system.h abstraction for utime()
fixes #297
--- 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.
