docs/src/resolve-conflicts.md@f6de48471c9c
docs/src/resolve-conflicts.md
Sat, 13 Apr 2019 16:51:22 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 13 Apr 2019 16:51:22 +0200
- changeset 571
- f6de48471c9c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add first dav-sync binary 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.
