docs/src/resolve-conflicts.md@14e7101d7604
docs/src/resolve-conflicts.md
Sun, 06 Oct 2019 13:27:24 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 06 Oct 2019 13:27:24 +0200
- changeset 650
- 14e7101d7604
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix some hash based conflict resolution bugs and add tests for it
--- 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.
