docs/src/resolve-conflicts.md@9c2e229b05f9
docs/src/resolve-conflicts.md
Sun, 31 Aug 2025 14:37:41 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 31 Aug 2025 14:37:41 +0200
- changeset 876
- 9c2e229b05f9
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
remove duplicated size_str function from sync.c
--- 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.
