trouble w/ pushing commits -- "failed to push some refs"

Robert Dodier <robert.dodier at gmail.com> writes:

> Is there any way to have Git tell me what it thinks is the matter?
> I'd rather know before starting to hack on stuff.

Your original post had in the error message something like
"not a fast forward". This means that the 2 branches (your
master and origin/master) have a history that looks like

    ----
__/_____



rather than

   ____
__/

i.e. the branches share a common ancestor, but there have
been commits on each since then.

A rebase will make the first history look like the 2nd.

>
> Also, is rebasing the only way out of this situation?
> I hope I don't have to recreate my commit history.


Yes, it is, for the above reason. You will not need to recreate
the commit history, except possibly to add something about
resolving conflicts.

-- 
Leo Butler                <l_butler at users.sourceforge.net>
SDF Public Access UNIX System -   http://sdf.lonestar.org