docs/src/resolve-conflicts.md@3b9ac2dd757d
docs/src/resolve-conflicts.md
Sun, 31 Aug 2025 14:32:55 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 31 Aug 2025 14:32:55 +0200
- changeset 875
- 3b9ac2dd757d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
replace a linked list in the process_parts function with a low level array
--- 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.
