docs/src/resolve-conflicts.md@bbe2925eb590
docs/src/resolve-conflicts.md
Thu, 28 Nov 2024 17:53:13 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 28 Nov 2024 17:53:13 +0100
- changeset 850
- bbe2925eb590
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
revert property set/remove list changes
--- 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.
