docs/src/resolve-conflicts.md@a7072ebb1ce0
docs/src/resolve-conflicts.md
Wed, 20 Nov 2019 12:17:55 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 20 Nov 2019 12:17:55 +0100
- changeset 682
- a7072ebb1ce0
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add more split 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.
