docs/src/resolve-conflicts.md

Wed, 30 May 2018 11:26:28 +0200

author
Mike Becker <universe@uap-core.de>
date
Wed, 30 May 2018 11:26:28 +0200
changeset 388
0b96ae226838
parent 285
02d3e4b1245f
child 563
3dffe58a573f
permissions
-rw-r--r--

fixes double-malloc() in tags.c + marks a realloc() problem

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