docs/src/resolve-conflicts.md@ad61c1654dce
docs/src/resolve-conflicts.md
Fri, 20 Sep 2019 20:27:05 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 20 Sep 2019 20:27:05 +0200
- changeset 645
- ad61c1654dce
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix missing namespaceinfo map initializataion
--- 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.
