On Sat, 4 Feb 2017, Hélio Guilherme wrote: > Can't you git push --force ?
Thanks, Hélio, but that doesn't work. I've tried git pull git reset --hard cdd2fe git push origin HEAD --force (and also just plain "git push --force") but I'm getting the message (with both of the last two commands): <quote> remote: error: denying non-fast-forward refs/heads/master (you should pull first) To ssh://git.code.sf.net/p/gretl/git ! [remote rejected] master -> master (non-fast-forward) </quote> I don't like that "you should pull first", since that's exactly what I did, and seems to take me into a circle. Allin > On Sat, Feb 4, 2017 at 12:34 AM, Allin Cottrell <cottrell(a)wfu.edu> wrote: > >> On Fri, 3 Feb 2017, Allin Cottrell wrote: >> >> Oof, someone (not me!) has done a premature merge of "gentest" into master >>> and I'm afraid the code base is seriously messed up right now. >>> >>> Hopefully git is smart enough that we can pull out of this before long. >>> But if gretl won't build right now, you know what's happening. >> >> git reset --hard cdd2fe >> >> fixes my working copy of master, but I haven't yet figured how to >> propagate this back to sourceforge (commit/push doesn't work). >> >> Allin
