docs/src/resolve-conflicts.md

2017-09-24

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 24 Sep 2017 11:31:01 +0200 (2017-09-24)
changeset 316
9d0505d80044
parent 285
02d3e4b1245f
child 563
3dffe58a573f
permissions
-rw-r--r--

adds dav-sync lock timeout config element

---
title: 'dav-sync resolve-conflicts'
---

**`dav-sync resolve-conflicts <directory>`**

Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command.
In other words: by executing this command you assert that *you* have resolved the conflicts.

mercurial