$ git push
To git+ssh://...
! [rejected] summary -> summary (non-fast forward)
error: failed to push some refs to 'git+ssh://...'
Mh, "not-fast forward" what? am I playing a song? well, after all, I didn't do anything strange (I suppose):
- was on master
- branched out a feature branch
- did some commits on master and some commits on the branch
- rebase the branch on master
Well, after a bit of panic, I googled and found not to worry: did another pull
$ git pull
Merge made by recursive.
then push went pretty good:
$ git push
...
To git+ssh://...
6f6324d..f39911e HEAD -> summary
2 comments:
git error messages (and information messages for that matter) are horrible. That and abysmal documentation are holding me away from it.
I really like git, but you definitely have to develop a symbiosis with it to know how things like error messages translate into the actual problems you're trying to solve.
Post a Comment