docs/src/resolve-conflicts.md@83f832e345e0
docs/src/resolve-conflicts.md
Sun, 08 Aug 2021 11:45:36 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Aug 2021 11:45:36 +0200
- changeset 730
- 83f832e345e0
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implement secretstore config
--- 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.
