docs/src/resolve-conflicts.md@05647e862a17
docs/src/resolve-conflicts.md
Sat, 30 Sep 2023 16:33:47 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 30 Sep 2023 16:33:47 +0200
- changeset 795
- 05647e862a17
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add new config parser
--- 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.
