docs/src/resolve-conflicts.md@85f8f8340959
docs/src/resolve-conflicts.md
Sat, 18 Jul 2026 09:47:20 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 18 Jul 2026 09:47:20 +0200
- branch
- dav-2
- changeset 929
- 85f8f8340959
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add dav_sql_statement_get_errorcode/dav_sql_statement_get_errormessage
--- 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.
