docs/src/resolve-conflicts.md@d7f5067a27ce
docs/src/resolve-conflicts.md
Sun, 17 Dec 2023 15:03:01 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 17 Dec 2023 15:03:01 +0100
- changeset 798
- d7f5067a27ce
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
remove list_repositories() config.c function in favor of a cmd_list_repositories() function in main.c
--- 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.
