docs/src/resolve-conflicts.md@29d544c3c2b8
docs/src/resolve-conflicts.md
Sun, 17 Sep 2023 13:51:01 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 17 Sep 2023 13:51:01 +0200
- changeset 794
- 29d544c3c2b8
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
remove tm_isdst = -1 because this was just a test
--- 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.
