Re: ! [rejected] master -> master (non-fast forward)
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- Nov 18, 2007, 18:29 UTC
- Message-ID
- <20071118182901.GA5939@steel.home>
- In-Reply-To
- <9e4733910711180712n6ee271fau774310e63ab08f6d@mail.gmail.com>
Jon Smirl, Sun, Nov 18, 2007 16:12:10 +0100:
Show 7 quoted lines
> What's causing this? I'm using stgit on the master branch. > I'm fixing it each time on the remote server by deleting the ref to master. > > 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.