From 8529cb2ff67181b969c3f4ecec68523137988f2c Mon Sep 17 00:00:00 2001
From: "http://xgm.de/oid/" <Horus@web>
Date: Mon, 24 Aug 2015 19:41:34 +0000
Subject: [PATCH]

---
 doc/forum/HowTo_Conflict_Resolution.mdwn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/forum/HowTo_Conflict_Resolution.mdwn b/doc/forum/HowTo_Conflict_Resolution.mdwn
index c180cc1199..2e43efe69e 100644
--- a/doc/forum/HowTo_Conflict_Resolution.mdwn
+++ b/doc/forum/HowTo_Conflict_Resolution.mdwn
@@ -40,6 +40,7 @@ To /home/florian/Desktop/AA
    83ff4c6..7df9834  git-annex -> synced/git-annex
    b86e708..59a1240  annex/direct/master -> synced/master
 ok
+```
 
 ```
 florian@horus ~/Desktop/BB (git)-[annex/direct/master] % git annex get .
@@ -58,6 +59,8 @@ How can I resolve this conflict now? Is there a way to tell which bin1 / bin2 is
 
 This case might appear somehow artifical but I was caught in that various times when syncing my music database. Actually I didn't care which version of the database it took, but I was unable to produce a coherent data set, so that the database files only come from one sync partner.
 
+I did the git annex get after syncing, becaue usually I sync using --content.
+
 Thanks,
 Florian