docs/src/resolve-conflicts.md@d262210f8454
docs/src/resolve-conflicts.md
Sun, 27 Oct 2024 16:08:28 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 27 Oct 2024 16:08:28 +0100
- changeset 838
- d262210f8454
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move ssl version parser to new function
--- 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.
