docs/src/resolve-conflicts.md@a2f1d7c1755c
docs/src/resolve-conflicts.md
Mon, 12 Jun 2023 21:43:12 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 12 Jun 2023 21:43:12 +0200
- changeset 761
- a2f1d7c1755c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix bin-tests not using the correct binary directory
--- 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.
