docs/src/resolve-conflicts.md@22257f6d06a3
docs/src/resolve-conflicts.md
Thu, 23 May 2024 23:19:06 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 23 May 2024 23:19:06 +0200
- changeset 817
- 22257f6d06a3
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix incorrect stat flags on linux in metadata test scripts
--- 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.
