docs/src/resolve-conflicts.md@6524f45f304e
docs/src/resolve-conflicts.md
Sun, 11 Aug 2019 11:27:04 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 11 Aug 2019 11:27:04 +0200
- changeset 622
- 6524f45f304e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add some dav-sync 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.
