docs/src/resolve-conflicts.md@dff5f4c23aa7
docs/src/resolve-conflicts.md
Wed, 23 Oct 2024 09:46:33 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 23 Oct 2024 09:46:33 +0200
- changeset 832
- dff5f4c23aa7
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move pwdstore to libidav
--- 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.
