From 1b422dbe690076e7b12f2632f0abd3c495a2bdd4 Mon Sep 17 00:00:00 2001
From: "felix.hagemann@b76e9ea0928cf33dacffc37ec3dbecf33171a8a5"
 <felixhagemann@web>
Date: Sat, 13 Jan 2018 11:25:46 +0000
Subject: [PATCH]

---
 ..._sync_fails_in_repo1_but_not_in_repo2.mdwn | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2.mdwn

diff --git a/doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2.mdwn b/doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2.mdwn
new file mode 100644
index 0000000000..222befd167
--- /dev/null
+++ b/doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2.mdwn
@@ -0,0 +1,45 @@
+Hello,
+
+I am using two repos in direct mode that are connected via ssh.
+Syncing fails in one direction but works in the other, I don't understand how to fix that.
+
+## repo2 -> repo1 works:
+
+    server$ git-annex sync
+    commit  ok
+    pull repo1 
+    From client:~/media/img/db
+     + be62780...2d74673 master     -> client/master  (forced update)
+     + be62780...2d74673 synced/master -> client/synced/master  (forced update)
+    ok
+    push repo1 
+    Total 0 (delta 0), reused 0 (delta 0)
+    To client:~/media/img/db
+       2d74673..be62780  annex/direct/master -> synced/master
+    ok
+    server$ git-annex status
+    ? .t/repo
+    ? .t/tmprepo0
+    server$
+
+## repo1 -> repo2 fails:
+
+    client$ git-annex sync
+    commit  ok
+    pull repo2 
+    
+    fatal: You have not concluded your merge (MERGE_HEAD exists).
+    Please, commit your changes before you merge.
+    
+    fatal: You have not concluded your merge (MERGE_HEAD exists).
+    Please, commit your changes before you merge.
+    failed
+    git-annex: sync: 1 failed
+    client$ git-annex status
+    client$
+
+Hopefully somebody knows how to fix that.
+
+Regards,
+
+Felix