Is there conflicts in your repository? What is the result of a git status?
If there is no conflicts, I think that someome pushed new commits and you
need to do a git pull --rebase again.
William Seiti Mizuta
Desenvolvedor da Caelum
On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader <
> Frustrated new git user here...
> Anyway, I have some changes that I would like to push but am unable I get
> the following error:
> error: failed to push some refs to 'ssh://git@<...>'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
> Okay, so if I am translating git's terminology back to human language, I
> believe that this is telling me that I cannot push because I would lose
> history. My change is not downstream of where the head is.
> The thing is that I just did a successful git pull -rebase, so my changes
> should be right on top of the head. I can confirm that by attempting
> another pull:
> JohnKramer-2:statistics jkramer$ git pull --rebase
> Current branch nov2012 is up to date.
> What's going on here?