docs/src/resolve-conflicts.md@78e501f6370d
docs/src/resolve-conflicts.md
Sun, 02 Jul 2023 11:44:09 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 02 Jul 2023 11:44:09 +0200
- changeset 773
- 78e501f6370d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix non-standard shell script use in versioning test script
--- 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.
