docs/src/resolve-conflicts.md@9385330bdd38
docs/src/resolve-conflicts.md
Tue, 09 Apr 2024 21:43:36 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 09 Apr 2024 21:43:36 +0200
- changeset 811
- 9385330bdd38
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav repo-url command containing the password base64 encoded
--- 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.
