docs/src/resolve-conflicts.md@a569148841ff
docs/src/resolve-conflicts.md
Sun, 16 Apr 2023 14:12:24 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 16 Apr 2023 14:12:24 +0200
- changeset 746
- a569148841ff
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix build system
--- 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.
