Re: [Gretl-devel] gretl git in serious disarray
On Fri, 3 Feb 2017, Allin Cottrell 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).
For future reference (though I hope this isn't needed again!), the
correct procedure seems to be:
1. git pull
2. Issue "git revert" commands for the bad commit IDs, working
backwards in time (e.g. "git revert 85f3d6", ...)
3. git push
So I think we're OK again now.
Allin