docs/src/resolve-conflicts.md@591377a27fa3
docs/src/resolve-conflicts.md
Tue, 09 Sep 2025 16:01:30 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 09 Sep 2025 16:01:30 +0200
- branch
- dav-2
- changeset 885
- 591377a27fa3
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move resource_get_remote_change to a separate source file
--- 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.
