docs/src/resolve-conflicts.md@6740836b7a1e
docs/src/resolve-conflicts.md
Sun, 23 Feb 2025 13:27:27 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 23 Feb 2025 13:27:27 +0100
- changeset 855
- 6740836b7a1e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
ucx CX_STR fix
--- 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.
