docs/src/resolve-conflicts.md@7e67689241fd
docs/src/resolve-conflicts.md
Sat, 25 Feb 2023 11:01:46 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 25 Feb 2023 11:01:46 +0100
- changeset 742
- 7e67689241fd
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
new build system
--- 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.
