docs/src/resolve-conflicts.md@26541c37b619
docs/src/resolve-conflicts.md
Tue, 14 Oct 2025 21:02:26 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 14 Oct 2025 21:02:26 +0200
- branch
- dav-2
- changeset 887
- 26541c37b619
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add TODOs for using modern ucx features
--- 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.
