docs/src/resolve-conflicts.md@0cfe006fcad2
docs/src/resolve-conflicts.md
Mon, 22 Apr 2019 14:02:34 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 22 Apr 2019 14:02:34 +0200
- changeset 588
- 0cfe006fcad2
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav_print_node
tags with namespace def were closed twice
--- 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.
