docs/src/resolve-conflicts.md

Sun, 21 Apr 2019 09:41:05 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 21 Apr 2019 09:41:05 +0200
changeset 579
c80d5730c00b
parent 563
3dffe58a573f
permissions
-rw-r--r--

add check to detect changed link properties in dav-sync pull

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