docs/src/resolve-conflicts.md@ae759e4be591
docs/src/resolve-conflicts.md
Mon, 12 Jun 2023 21:40:31 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 12 Jun 2023 21:40:31 +0200
- changeset 760
- ae759e4be591
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav-sync push not deleting collections in the right order
--- 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.
