docs/src/resolve-conflicts.md@cda8093116f2
docs/src/resolve-conflicts.md
Wed, 08 May 2019 19:22:06 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 08 May 2019 19:22:06 +0200
- changeset 590
- cda8093116f2
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
reduces code complexity of util_resource_name()
--- 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.
