docs/src/resolve-conflicts.md@3ed93d188375
docs/src/resolve-conflicts.md
Sun, 17 Sep 2023 13:40:48 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 17 Sep 2023 13:40:48 +0200
- changeset 793
- 3ed93d188375
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
use _mkgmtime instead of mktime in parse_iso8601() 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.
