docs/src/resolve-conflicts.md@efbd59642577
docs/src/resolve-conflicts.md
Fri, 21 Apr 2023 21:25:32 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 21 Apr 2023 21:25:32 +0200
- changeset 747
- efbd59642577
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
ucx 3 update, basic dav commands work, most stuff is still broken
--- 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.
