diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao <maurizio@web> | 2014-01-30 02:28:26 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-01-30 02:28:26 +0000 |
| commit | e6b6f9c93f244b2f9e4c1cfa196fe6323567dcac (patch) | |
| tree | 767c48f4c500d6ac68e40c6086f941350069090f | |
| parent | bcf53c9a0bae4b3ed6bdc961b9fba70bbe40966e (diff) | |
| -rw-r--r-- | doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn b/doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn index af296049d..91d7a886b 100644 --- a/doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn +++ b/doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn @@ -4,7 +4,7 @@ I tried this: git-annex fsck --from rsync.net_annex -from both machines. No error is reported, but files are missing here and there and files differ here and there. +on both machines. No error is reported, but files are missing here and there and files differ here and there. I stopped the assistant on both machines and tried to sync with: @@ -12,9 +12,14 @@ I stopped the assistant on both machines and tried to sync with: and got: + commit + ok + pull 'XXX' fatal: Unable to find remote helper for 'xmpp' - Pushing to XXX failed - (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config) + failed + push 'XXX' + Pushing to XXX failed + (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config) failed git-annex: sync: 2 failed |