Re: Problem with git push

[Phil Holmes]

----- Original Message ----- 
From: "Phil Holmes" <address@hidden>
To: "Reinhold Kainhofer" <address@hidden>; <address@hidden>
Sent: Thursday, September 22, 2011 3:28 PM
Subject: Re: Problem with git push


> ----- Original Message ----- 
> From: "Reinhold Kainhofer" <address@hidden>
>
> > Simply fetch from the server:
> > git pull --rebase
>
> Well, I was sure I must have done that at one point, but I've done it now 
> and success :-)  Thanks Reinhold.


Update.  That fixed it on my VM (slow) machine but not my "real" Ubuntu 
(fast) machine.  Unless there are other commands I can try, I'm seriously 
thinking I may have to nuke my git directory and start again :-(

--
Phil Holmes