docs/src/resolve-conflicts.md@d78619cc5a4d
docs/src/resolve-conflicts.md
Sun, 05 Jul 2020 11:55:54 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 05 Jul 2020 11:55:54 +0200
- changeset 722
- d78619cc5a4d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
merges feature/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.
