docs/src/resolve-conflicts.md@349106ea431c
docs/src/resolve-conflicts.md
Mon, 21 Oct 2024 12:47:34 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 21 Oct 2024 12:47:34 +0200
- changeset 830
- 349106ea431c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix wrong context session list compare func
--- 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.
