docs/src/resolve-conflicts.md@a3e35cae098b
docs/src/resolve-conflicts.md
Mon, 12 Jun 2023 21:17:37 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 12 Jun 2023 21:17:37 +0200
- changeset 759
- a3e35cae098b
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav-sync push crash
--- 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.
