docs/src/resolve-conflicts.md@378b5ab86f77
docs/src/resolve-conflicts.md
Thu, 14 Sep 2023 18:11:50 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 14 Sep 2023 18:11:50 +0200
- changeset 789
- 378b5ab86f77
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add new build system for windows
--- 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.
