mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao 2014-01-30 02:28:26 +00:00 committed by admin
parent 0a4bae2731
commit ed12d6058f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/forum/How_to_solve__problem_with_diverging_repositories_handled_by_the_assistant__63__.mdwn
View file

@ -4,7 +4,7 @@ I tried this:
git-annex fsck --from rsync.net_annex 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: 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: and got:
commit
ok
pull 'XXX'
fatal: Unable to find remote helper for 'xmpp' fatal: Unable to find remote helper for 'xmpp'
Pushing to XXX failed failed
(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config) 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 failed
git-annex: sync: 2 failed git-annex: sync: 2 failed