trouble w/ pushing commits -- "failed to push some refs"
Subject: trouble w/ pushing commits -- "failed to push some refs"
From: Robert Dodier
Date: Sat, 16 Jul 2011 12:33:19 -0600
On 7/15/11, Leo Butler <l_butler at users.sourceforge.net> wrote:
> git checkout master
> git fetch
> EDITOR=emacs git rebase --interactive --onto FETCH_HEAD
Well, when I try this, I get:
$ git checkout master
Previous HEAD position was 2cfae0e... Merge branch 'master' of
ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima
into HEAD
Switched to branch "master"
$ git fetch
robert_dodier at maxima.git.sourceforge.net's password:
robert_dodier at maxima.git.sourceforge.net's password:
remote: Counting objects: 41, done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 28 (delta 20), reused 0 (delta 0)
Unpacking objects: 100% (28/28), done.
>From ssh://robert_dodier at maxima.git.sourceforge.net/gitroot/maxima/maxima
b2d2678..d69d06b master -> origin/master
$ EDITOR=vim git rebase --interactive --onto FETCH_HEAD
fatal: Needed a single revision
Invalid base
A cursory search doesn't reveal a solution. Ideas?
I guess I'm rather puzzled about this situation.
I guess that I am trying push changes to files to which
someone else pushed changes after I got a copy to work on.
(1) Shouldn't git pull merge in the other changes so that I am
up-to-date wrt other developers' changes?
(2) How can I get Git to tell me (short of working through a rebase)
what are the files in question?
(3) This situation isn't too surprising in the sense that if there are
multiple developers pushing changes, sooner or later there will
be changes to the same files. Why isn't there any obvious way to
resolve this situation?
Thanks for any info.
Robert Dodier