Thread (9 messages) flat view 9 messages, 3 authors, 2016-06-15

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

From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:52

Jon Smirl, Sun, Nov 18, 2007 16:12:10 +0100:
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help