docs/src/resolve-conflicts.md@c401f4af44b1
docs/src/resolve-conflicts.md
Sun, 05 Jul 2020 11:47:24 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 05 Jul 2020 11:47:24 +0200
- branch
- feature/dav-edit
- changeset 721
- c401f4af44b1
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
adds support for option terminator '--'
also adds support for option arguments within the same cmd arg
e.g. -omyoutfile does now work
--- 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.
