docs/src/resolve-conflicts.md

15 months ago

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 17 Sep 2023 13:18:39 +0200 (15 months ago)
changeset 792
4e4e5bbad164
parent 563
3dffe58a573f
permissions
-rw-r--r--

add tests for util_parse_creationdate

---
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.

mercurial