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=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus 2012-06-25 13:37:36 +00:00 • committed by admin
parent fa5c88b8f1
commit fb415526e9
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn Normal file
View file

@ -0,0 +1,12 @@
Running the 'assistant' branch, I occassionally get
To myhost1:/Users/jtang/annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to 'myhost1:/Users/jtang/annex'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and merge the remote changes
hint: (e.g. 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(Recording state in git...)
manually running a 'git annex sync' usually fixes it, I guess once the sync command runs periodically this problem will go away, is this even OSX specific? I don't quite get the behaviour that is described in [[design/assistant/blog/day_15__its_aliiive]].