diff options
author | felix.hagemann@b76e9ea0928cf33dacffc37ec3dbecf33171a8a5 <felixhagemann@web> | 2018-01-13 11:25:46 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2018-01-13 11:25:46 +0000 |
commit | a11afa67685bcc9583d4de98355c72a8690a69b1 (patch) | |
tree | 4763326c03c923c19abb9c367e670958469f9aa2 | |
parent | 3374b5c3222e027e54b595cea612d63aa6b34899 (diff) |
-rw-r--r-- | doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2.mdwn | 45 |
1 files changed, 45 insertions, 0 deletions
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 000000000..222befd16 --- /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 |