docs/src/resolve-conflicts.md@baf199df500e
docs/src/resolve-conflicts.md
Tue, 09 Apr 2024 21:28:24 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 09 Apr 2024 21:28:24 +0200
- changeset 810
- baf199df500e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
don't store directories with a trailing path separator in the sync db
--- 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.
