docs/src/resolve-conflicts.md@e0358fa1a3b1
docs/src/resolve-conflicts.md
Sun, 08 Aug 2021 12:45:31 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Aug 2021 12:45:31 +0200
- changeset 731
- e0358fa1a3b1
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
implement secretstore unlock command
--- 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.
