docs/src/resolve-conflicts.md@029e839a4079
docs/src/resolve-conflicts.md
Thu, 01 May 2025 01:16:53 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 01 May 2025 01:16:53 +0200
- changeset 864
- 029e839a4079
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix incorrect lzma.lib dependency
--- 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.
