docs/src/resolve-conflicts.md@e9a5dd08258d
docs/src/resolve-conflicts.md
Wed, 02 Nov 2022 11:45:56 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Wed, 02 Nov 2022 11:45:56 +0100
- changeset 741
- e9a5dd08258d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix return value in util_exec_command on 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.
