docs/src/resolve-conflicts.md@1f40ca07ae1b
docs/src/resolve-conflicts.md
Sat, 20 Apr 2024 13:01:58 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 20 Apr 2024 13:01:58 +0200
- changeset 815
- 1f40ca07ae1b
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add more xattr malloc checks
--- 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.
