docs/src/resolve-conflicts.md@098b2e3ab240
docs/src/resolve-conflicts.md
Tue, 13 Jun 2023 21:58:29 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 13 Jun 2023 21:58:29 +0200
- changeset 762
- 098b2e3ab240
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix iterator misuse in dav-sync delete-conflict
--- 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.
