docs/src/resolve-conflicts.md@4e23087d3d90
docs/src/resolve-conflicts.md
Mon, 16 Sep 2019 19:49:04 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 16 Sep 2019 19:49:04 +0200
- changeset 642
- 4e23087d3d90
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add config element for push strategy
--- 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.
