docs/src/resolve-conflicts.md@64989511f6c3
docs/src/resolve-conflicts.md
Mon, 08 Sep 2025 11:39:54 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 08 Sep 2025 11:39:54 +0200
- branch
- dav-2
- changeset 881
- 64989511f6c3
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add resource iterator and resource map
--- 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.
