docs/src/resolve-conflicts.md@a7883961b5f4
docs/src/resolve-conflicts.md
Sun, 08 Aug 2021 14:59:02 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Aug 2021 14:59:02 +0200
- changeset 733
- a7883961b5f4
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add set-master-password 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.
