docs/src/resolve-conflicts.md@0d352b79363a
docs/src/resolve-conflicts.md
Fri, 15 Nov 2019 18:07:11 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 15 Nov 2019 18:07:11 +0100
- changeset 679
- 0d352b79363a
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix some versioning related bugs and add tests
--- 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.
