docs/src/resolve-conflicts.md@673a803d2203
docs/src/resolve-conflicts.md
Tue, 06 Feb 2024 13:29:31 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 06 Feb 2024 13:29:31 +0100
- changeset 806
- 673a803d2203
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix session dup
--- 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.
