docs/src/resolve-conflicts.md

Sun, 15 Dec 2019 09:18:26 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 15 Dec 2019 09:18:26 +0100
changeset 698
c07252cc7476
parent 563
3dffe58a573f
permissions
-rw-r--r--

add new element to config.xsd

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