docs/src/resolve-conflicts.md@56b66fe2b4f5
docs/src/resolve-conflicts.md
Thu, 05 Dec 2019 12:37:48 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 05 Dec 2019 12:37:48 +0100
- changeset 692
- 56b66fe2b4f5
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav-sync deltav versioning
--- 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.
