docs/src/resolve-conflicts.md@3ffee649f0b1
docs/src/resolve-conflicts.md
Thu, 02 Jul 2026 20:50:47 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 02 Jul 2026 20:50:47 +0200
- branch
- dav-2
- changeset 921
- 3ffee649f0b1
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
make dav_copy/move newpath arg const
--- 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.
