docs/src/resolve-conflicts.md@1d20a6cab2e5
docs/src/resolve-conflicts.md
Sun, 11 Aug 2019 08:24:10 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 11 Aug 2019 08:24:10 +0200
- changeset 619
- 1d20a6cab2e5
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix free in sync_get_file_tags
--- 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.
