docs/src/resolve-conflicts.md@8e2727fc4e07
docs/src/resolve-conflicts.md
Sat, 14 Feb 2026 18:11:29 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 14 Feb 2026 18:11:29 +0100
- branch
- dav-2
- changeset 913
- 8e2727fc4e07
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add dav_move test
--- 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.
