docs/src/resolve-conflicts.md

Mon, 04 Feb 2019 14:11:57 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Mon, 04 Feb 2019 14:11:57 +0100
changeset 504
bf3695fee719
parent 285
02d3e4b1245f
child 563
3dffe58a573f
permissions
-rw-r--r--

fix missiong return in versioning_end()

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