docs/src/resolve-conflicts.md@7384da29c2b4
docs/src/resolve-conflicts.md
Sat, 28 Mar 2020 15:58:30 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 28 Mar 2020 15:58:30 +0100
- branch
- feature/dav-edit
- changeset 710
- 7384da29c2b4
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
cmd_edit - we do not need fstat() for detecting changes on the temporary file
--- 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.
