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

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.

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

best

Robert Dodier

On 7/15/11, Leo Butler <l_butler at users.sourceforge.net> wrote:
> Raymond Toy <toy.raymond at gmail.com> writes:
>
>>>>>>> "Robert" == Robert Dodier <robert.dodier at gmail.com> writes:
>>
>>     Robert> I did a git pull before trying to push stuff.
>>     Robert> I guess I should have mentioned that.
>>
>> Sorry then, I have no further ideas.  A google search on the error
>> message indicates that git pull is the answer.  Perhaps you were
>> unlucky and someone else did a push between the time you did a pull
>> and wanted to do the push?   But maxima code isn't changing *that*
>> fast in general.
>
> I sent a message earlier, but it is being held up.
>
> What I would try is this:
>
> git checkout master
> git fetch
> EDITOR=emacs git rebase --interactive --onto FETCH_HEAD
>
> This will pop you into an emacs buffer, and you can
> alter your coommits, and so on. Exiting the buffer will
> start applying the commits. If a conflict exists, you'll
> get popped into a buffer to manually fix the conflicts;
> on exiting, do
>
> git add filename
> git rebase --continue
>
> If you get into a pickle,
>
> git rebase --abort
>
> undoes everything (unless the rebase is done).
>
> I would suggest doing these fixes in a copy of your
> repo in case something goes bad.
>
>
> --
> Leo Butler                <l_butler at users.sourceforge.net>
> SDF Public Access UNIX System -   http://sdf.lonestar.org
> _______________________________________________
> Maxima mailing list
> Maxima at math.utexas.edu
> http://www.math.utexas.edu/mailman/listinfo/maxima
>