docs/src/resolve-conflicts.md@5f8ccd1d59bd
docs/src/resolve-conflicts.md
Mon, 08 Sep 2025 10:31:08 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 08 Sep 2025 10:31:08 +0200
- branch
- dav-2
- changeset 880
- 5f8ccd1d59bd
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix wrong lock setting in cmd_pull
--- 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.
