docs/src/resolve-conflicts.md

2019-12-02

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Mon, 02 Dec 2019 13:29:36 +0100 (2019-12-02)
changeset 687
9922a349a61a
parent 563
3dffe58a573f
permissions
-rw-r--r--

add support for unicode args 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.

mercurial