docs/src/resolve-conflicts.md@592ff4ca2aaa
docs/src/resolve-conflicts.md
Thu, 20 Jul 2023 22:15:01 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 20 Jul 2023 22:15:01 +0200
- changeset 784
- 592ff4ca2aaa
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
log command line arguments
--- 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.
