docs/src/resolve-conflicts.md@3dffe58a573f
docs/src/resolve-conflicts.md
Wed, 10 Apr 2019 13:50:24 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 10 Apr 2019 13:50:24 +0200
- changeset 563
- 3dffe58a573f
- parent 285
- 02d3e4b1245f
- permissions
- -rw-r--r--
adds list-conflicts command to dav-sync
--- 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.
