docs/src/resolve-conflicts.md@b6e9fd3f1951
docs/src/resolve-conflicts.md
Wed, 24 Jul 2024 23:45:31 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 24 Jul 2024 23:45:31 +0200
- changeset 826
- b6e9fd3f1951
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav add-repo crash in case .dav/config.xml doesn't exist
--- 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.
