docs/src/resolve-conflicts.md@3e4c0285a868
docs/src/resolve-conflicts.md
Fri, 12 Jul 2019 16:59:08 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 12 Jul 2019 16:59:08 +0200
- changeset 608
- 3e4c0285a868
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix build on windows
--- 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.
