docs/src/resolve-conflicts.md@f21be698def9
docs/src/resolve-conflicts.md
Wed, 07 Feb 2024 17:12:59 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 07 Feb 2024 17:12:59 +0100
- changeset 808
- f21be698def9
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add util_size_str2() func, a variation of util_size_str with more parameters
--- 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.
