docs/src/resolve-conflicts.md@6d1d569068bf
docs/src/resolve-conflicts.md
Sat, 12 Oct 2019 08:48:35 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 12 Oct 2019 08:48:35 +0200
- changeset 651
- 6d1d569068bf
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
remove command aliases from dav help text
--- 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.
