docs/src/resolve-conflicts.md@2b8a65ed6f4c
docs/src/resolve-conflicts.md
Sun, 05 Apr 2020 11:06:34 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 05 Apr 2020 11:06:34 +0200
- branch
- feature/dav-edit
- changeset 720
- 2b8a65ed6f4c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds support for -L option in dav edit
--- 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.
