Mercurial > hg > dav / file diff

--- a/docs/src/resolve-conflicts.md	Wed Apr 10 13:48:44 2019 +0200
+++ b/docs/src/resolve-conflicts.md	Wed Apr 10 13:50:24 2019 +0200
@@ -4,6 +4,8 @@
 
 **`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.
+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.