docs/src/resolve-conflicts.md@74a6e2d4fb1f
docs/src/resolve-conflicts.md
Sun, 08 Aug 2021 16:50:36 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Aug 2021 16:50:36 +0200
- changeset 735
- 74a6e2d4fb1f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
reactivate error in case of unknown config elements
--- 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.
