docs/src/resolve-conflicts.md@81e066c9ff87
docs/src/resolve-conflicts.md
Thu, 15 Aug 2019 20:00:40 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 15 Aug 2019 20:00:40 +0200
- changeset 627
- 81e066c9ff87
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
finish basic pull 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.
