docs/src/resolve-conflicts.md@68ea3a0fe66f
docs/src/resolve-conflicts.md
Sun, 07 Sep 2025 15:36:24 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 07 Sep 2025 15:36:24 +0200
- branch
- dav-2
- changeset 878
- 68ea3a0fe66f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
prepare build system for more testing, unify opt parsers
--- 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.
