docs/src/resolve-conflicts.md@bd96cbb0e205
docs/src/resolve-conflicts.md
Tue, 12 Sep 2023 18:09:19 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 12 Sep 2023 18:09:19 +0200
- changeset 787
- bd96cbb0e205
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
update uwproj
--- 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.
