Re: ! [rejected] master -> master (non-fast forward)

From: Jeff King <peff@peff.net>
Date: Nov 20, 2007, 04:16 UTC
Message-ID: <20071120041620.GA23566@sigill.intra.peff.net>
In-Reply-To: <20071118182901.GA5939@steel.home>

On Sun, Nov 18, 2007 at 07:29:01PM +0100, Alex Riesen wrote:

Show 8 quoted lines

> > jonsmirl@terra:~/ds$ git push digispeaker
> > To ssh://jonsmirl1@git.digispeaker.com/~/projects/digispeaker-kernel.git
> >  ! [rejected]        master -> master (non-fast forward)
> > error: failed to push to
> 
> the branch you are pushing does not fast-forward to the one on
> digispeaker. IOW, the master on digispeaker has changed since you made
> changes on your local master.

Alex, are you going to rework your "consolidate nonff errors and print a more extended message" patch on top of what's in next (I think it should be much simpler now).

-Peff